ExternalIPAnnotation serves as an override/hint of publishHostIP flag

kubernetes-sigs · Feb 18, 2020 · 6e75adc · 6e75adc
1 parent 7eef000
commit 6e75adc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/source/service.go b/source/service.go
@@ -234,30 +234,32 @@ func (sc *serviceSource) extractHeadlessEndpoints(svc *v1.Service, hostname stri
 		}
 		for _, headlessDomain := range headlessDomains {
 			if sc.publishHostIP {
-				log.Debugf("Generating matching endpoint %s with HostIP %s", headlessDomain, v.Status.HostIP)
-				// To reduce traffic on the DNS API only add record for running Pods. Good Idea?
-				if v.Status.Phase == v1.PodRunning {
-					targetsByHeadlessDomain[headlessDomain] = append(targetsByHeadlessDomain[headlessDomain], v.Status.HostIP)
-				} else {
-					log.Debugf("Pod %s is not in running phase", v.Spec.Hostname)
-				}
-			} else if _, ok := svc.Annotations[externalIPAnnotationKey]; ok {
-				node, err := sc.nodeInformer.Lister().Get(v.Spec.NodeName)
-				if err != nil {
-					return nil
-				}
-				var externalIPs endpoint.Targets
-				for _, address := range node.Status.Addresses {
-					if address.Type == v1.NodeExternalIP {
-						externalIPs = append(externalIPs, address.Address)
+				if _, ok := svc.Annotations[externalIPAnnotationKey]; ok {
+					node, err := sc.nodeInformer.Lister().Get(v.Spec.NodeName)
+					if err != nil {
+						return nil
+					}
+					var externalIPs endpoint.Targets
+					for _, address := range node.Status.Addresses {
+						if address.Type == v1.NodeExternalIP {
+							externalIPs = append(externalIPs, address.Address)
+						}
 					}
-				}
 
-				log.Debugf("Generating matching endpoint %s with Host ExternalIPs %v", headlessDomain, externalIPs)
-				if v.Status.Phase == v1.PodRunning {
-					targetsByHeadlessDomain[headlessDomain] = append(targetsByHeadlessDomain[headlessDomain], externalIPs...)
+					log.Debugf("Generating matching endpoint %s with Host ExternalIPs %v", headlessDomain, externalIPs)
+					if v.Status.Phase == v1.PodRunning {
+						targetsByHeadlessDomain[headlessDomain] = append(targetsByHeadlessDomain[headlessDomain], externalIPs...)
+					} else {
+						log.Debugf("Pod %s is not in running phase", v.Spec.Hostname)
+					}
 				} else {
-					log.Debugf("Pod %s is not in running phase", v.Spec.Hostname)
+					log.Debugf("Generating matching endpoint %s with HostIP %s", headlessDomain, v.Status.HostIP)
+					// To reduce traffic on the DNS API only add record for running Pods. Good Idea?
+					if v.Status.Phase == v1.PodRunning {
+						targetsByHeadlessDomain[headlessDomain] = append(targetsByHeadlessDomain[headlessDomain], v.Status.HostIP)
+					} else {
+						log.Debugf("Pod %s is not in running phase", v.Spec.Hostname)
+					}
 				}
 			} else {
 				log.Debugf("Generating matching endpoint %s with PodIP %s", headlessDomain, v.Status.PodIP)

diff --git a/source/service_test.go b/source/service_test.go
@@ -2327,7 +2327,7 @@ func TestHeadlessServicesExternalHostIP(t *testing.T) {
 				false,
 				tc.compatibility,
 				true,
-				false,
+				true,
 				[]string{},
 				tc.ignoreHostnameAnnotation,
 			)
-Original file line number
+Diff line change
@@ Expand Up / @@ -2327,7 +2327,7 @@ func TestHeadlessServicesExternalHostIP(t *testing.T) { @@
     				false,
     				tc.compatibility,
     				true,
-    				false,
+    				true,
     				[]string{},
     				tc.ignoreHostnameAnnotation,
     			)
@@ Expand Down @@