Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7078bfed
Unverified
Commit
7078bfed
authored
Aug 22, 2018
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Report cloudstack hostname address
parent
e46203c4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
cloudstack_instances.go
...loudprovider/providers/cloudstack/cloudstack_instances.go
+4
-0
metadata.go
pkg/cloudprovider/providers/cloudstack/metadata.go
+13
-2
No files found.
pkg/cloudprovider/providers/cloudstack/cloudstack_instances.go
View file @
7078bfed
...
@@ -69,6 +69,10 @@ func (cs *CSCloud) nodeAddresses(instance *cloudstack.VirtualMachine) ([]v1.Node
...
@@ -69,6 +69,10 @@ func (cs *CSCloud) nodeAddresses(instance *cloudstack.VirtualMachine) ([]v1.Node
{
Type
:
v1
.
NodeInternalIP
,
Address
:
instance
.
Nic
[
0
]
.
Ipaddress
},
{
Type
:
v1
.
NodeInternalIP
,
Address
:
instance
.
Nic
[
0
]
.
Ipaddress
},
}
}
if
instance
.
Hostname
!=
""
{
addresses
=
append
(
addresses
,
v1
.
NodeAddress
{
Type
:
v1
.
NodeHostName
,
Address
:
instance
.
Hostname
})
}
if
instance
.
Publicip
!=
""
{
if
instance
.
Publicip
!=
""
{
addresses
=
append
(
addresses
,
v1
.
NodeAddress
{
Type
:
v1
.
NodeExternalIP
,
Address
:
instance
.
Publicip
})
addresses
=
append
(
addresses
,
v1
.
NodeAddress
{
Type
:
v1
.
NodeExternalIP
,
Address
:
instance
.
Publicip
})
}
else
{
}
else
{
...
...
pkg/cloudprovider/providers/cloudstack/metadata.go
View file @
7078bfed
...
@@ -39,6 +39,7 @@ type metadata struct {
...
@@ -39,6 +39,7 @@ type metadata struct {
type
metadataType
string
type
metadataType
string
const
(
const
(
metadataTypeHostname
metadataType
=
"local-hostname"
metadataTypeExternalIP
metadataType
=
"public-ipv4"
metadataTypeExternalIP
metadataType
=
"public-ipv4"
metadataTypeInternalIP
metadataType
=
"local-ipv4"
metadataTypeInternalIP
metadataType
=
"local-ipv4"
metadataTypeInstanceID
metadataType
=
"instance-id"
metadataTypeInstanceID
metadataType
=
"instance-id"
...
@@ -58,10 +59,20 @@ func (m *metadata) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1
...
@@ -58,10 +59,20 @@ func (m *metadata) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1
return
nil
,
fmt
.
Errorf
(
"could not get internal IP: %v"
,
err
)
return
nil
,
fmt
.
Errorf
(
"could not get internal IP: %v"
,
err
)
}
}
return
[]
v1
.
NodeAddress
{
addresses
:=
[]
v1
.
NodeAddress
{
{
Type
:
v1
.
NodeExternalIP
,
Address
:
externalIP
},
{
Type
:
v1
.
NodeExternalIP
,
Address
:
externalIP
},
{
Type
:
v1
.
NodeInternalIP
,
Address
:
internalIP
},
{
Type
:
v1
.
NodeInternalIP
,
Address
:
internalIP
},
},
nil
}
hostname
,
err
:=
m
.
get
(
metadataTypeHostname
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"could not get hostname: %v"
,
err
)
}
if
hostname
!=
""
{
addresses
=
append
(
addresses
,
v1
.
NodeAddress
{
Type
:
v1
.
NodeHostName
,
Address
:
hostname
})
}
return
addresses
,
nil
}
}
// NodeAddressesByProviderID returns the addresses of the specified instance.
// NodeAddressesByProviderID returns the addresses of the specified instance.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment