DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix diff execution

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-11-05 22:22:49 -03:00
parent 81dde562e9
commit 754cc6a665
5 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkg/k8s/main.go
View file

@ -36,26 +36,27 @@ func ParseNameNS(input string) (string, string, error) {
return nsName[0], nsName[1], nil
}
// GetNodeIP returns the IP address of a node in the cluster
func GetNodeIP(kubeClient clientset.Interface, name string, useInternalIP bool) string {
// GetNodeIPOrName returns the IP address or the name of a node in the cluster
func GetNodeIPOrName(kubeClient clientset.Interface, name string, useInternalIP bool) string {
node, err := kubeClient.Core().Nodes().Get(name, metav1.GetOptions{})
if err != nil {
return ""
}
for _, address := range node.Status.Addresses {
if useInternalIP {
if useInternalIP {
for _, address := range node.Status.Addresses {
if address.Type == apiv1.NodeInternalIP {
if address.Address != "" {
return address.Address
}
}
continue
}
if address.Type == apiv1.NodeExternalIP {
if address.Address != "" {
return address.Address
} else {
for _, address := range node.Status.Addresses {
if address.Type == apiv1.NodeExternalIP {
if address.Address != "" {
return address.Address
}
}
}
}
@ -91,7 +92,7 @@ func GetPodDetails(kubeClient clientset.Interface) (*PodInfo, error) {
return &PodInfo{
Name: podName,
Namespace: podNs,
NodeIP: GetNodeIP(kubeClient, pod.Spec.NodeName, true),
NodeIP: GetNodeIPOrName(kubeClient, pod.Spec.NodeName, true),
Labels: pod.GetLabels(),
}, nil
}

2
pkg/k8s/main_test.go
View file

@ -164,7 +164,7 @@ func TestGetNodeIP(t *testing.T) {
}
for _, fk := range fKNodes {
address := GetNodeIP(fk.cs, fk.n, fk.i)
address := GetNodeIPOrName(fk.cs, fk.n, fk.i)
if address != fk.ea {
t.Errorf("expected %s, but returned %s", fk.ea, address)
}