allow hostname annotations to be ignored

main.go

@@ -71,6 +71,7 @@ func main() {
 		AnnotationFilter:         cfg.AnnotationFilter,
 		FQDNTemplate:             cfg.FQDNTemplate,
 		CombineFQDNAndAnnotation: cfg.CombineFQDNAndAnnotation,
+		IgnoreHostnameAnnotation: cfg.IgnoreHostnameAnnotation,
 		Compatibility:            cfg.Compatibility,
 		PublishInternal:          cfg.PublishInternal,
 		PublishHostIP:            cfg.PublishHostIP,

pkg/apis/externaldns/types.go

@@ -45,6 +45,7 @@ type Config struct {
 	AnnotationFilter         string
 	FQDNTemplate             string
 	CombineFQDNAndAnnotation bool
+	IgnoreHostnameAnnotation bool
 	Compatibility            string
 	PublishInternal          bool
 	PublishHostIP            bool
@@ -118,6 +119,7 @@ var defaultConfig = &Config{
 	AnnotationFilter:         "",
 	FQDNTemplate:             "",
 	CombineFQDNAndAnnotation: false,
+	IgnoreHostnameAnnotation: false,
 	Compatibility:            "",
 	PublishInternal:          false,
 	PublishHostIP:            false,
@@ -225,6 +227,7 @@ func (cfg *Config) ParseFlags(args []string) error {
 	app.Flag("annotation-filter", "Filter sources managed by external-dns via annotation using label selector semantics (default: all sources)").Default(defaultConfig.AnnotationFilter).StringVar(&cfg.AnnotationFilter)
 	app.Flag("fqdn-template", "A templated string that's used to generate DNS names from sources that don't define a hostname themselves, or to add a hostname suffix when paired with the fake source (optional). Accepts comma separated list for multiple global FQDN.").Default(defaultConfig.FQDNTemplate).StringVar(&cfg.FQDNTemplate)
 	app.Flag("combine-fqdn-annotation", "Combine FQDN template and Annotations instead of overwriting").BoolVar(&cfg.CombineFQDNAndAnnotation)
+	app.Flag("ignore-hostname-annotation", "Ignore hostname annotation when generating DNS names, valid only when using fqdn-template is set (optional, default: false)").BoolVar(&cfg.IgnoreHostnameAnnotation)
 	app.Flag("compatibility", "Process annotation semantics from legacy implementations (optional, options: mate, molecule)").Default(defaultConfig.Compatibility).EnumVar(&cfg.Compatibility, "", "mate", "molecule")
 	app.Flag("publish-internal-services", "Allow external-dns to publish DNS records for ClusterIP services (optional)").BoolVar(&cfg.PublishInternal)
 	app.Flag("publish-host-ip", "Allow external-dns to publish host-ip for headless services (optional)").BoolVar(&cfg.PublishHostIP)

pkg/apis/externaldns/types_test.go

@@ -87,6 +87,7 @@ var (
 		Sources:                  []string{"service", "ingress", "connector"},
 		Namespace:                "namespace",
 		FQDNTemplate:             "{{.Name}}.service.example.com",
+		IgnoreHostnameAnnotation: true,
 		Compatibility:            "mate",
 		Provider:                 "google",
 		GoogleProject:            "project",
@@ -163,6 +164,7 @@ func TestParseFlags(t *testing.T) {
 				"--source=connector",
 				"--namespace=namespace",
 				"--fqdn-template={{.Name}}.service.example.com",
+				"--ignore-hostname-annotation",
 				"--compatibility=mate",
 				"--provider=google",
 				"--google-project=project",
@@ -225,6 +227,7 @@ func TestParseFlags(t *testing.T) {
 				"EXTERNAL_DNS_SOURCE":                     "service\ningress\nconnector",
 				"EXTERNAL_DNS_NAMESPACE":                  "namespace",
 				"EXTERNAL_DNS_FQDN_TEMPLATE":              "{{.Name}}.service.example.com",
+				"EXTERNAL_DNS_IGNORE_HOSTNAME_ANNOTATION": "1",
 				"EXTERNAL_DNS_COMPATIBILITY":              "mate",
 				"EXTERNAL_DNS_PROVIDER":                   "google",
 				"EXTERNAL_DNS_GOOGLE_PROJECT":             "project",

pkg/apis/externaldns/validation/validation.go

@@ -65,5 +65,9 @@ func ValidateConfig(cfg *externaldns.Config) error {
 			return errors.New("TTL specified for Dyn is negative")
 		}
 	}
+
+	if cfg.IgnoreHostnameAnnotation && cfg.FQDNTemplate == "" {
+		return errors.New("FQDN Template must be set if ignoring annotations")
+	}
 	return nil
 }

pkg/apis/externaldns/validation/validation_test.go

@@ -116,3 +116,11 @@ func TestValidateGoodDynConfig(t *testing.T) {
 		assert.Nil(t, err, "Configuration should be valid, got this error instead", err)
 	}
 }
+
+func TestValidateBadIgnoreHostnameAnnotationsConfig(t *testing.T) {
+	cfg := externaldns.NewConfig()
+	cfg.IgnoreHostnameAnnotation = true
+	cfg.FQDNTemplate = ""
+
+	assert.Error(t, ValidateConfig(cfg))
+}

source/gateway.go

@@ -46,6 +46,7 @@ type gatewaySource struct {
 	annotationFilter         string
 	fqdnTemplate             *template.Template
 	combineFQDNAnnotation    bool
+	ignoreHostnameAnnotation bool
 }
 
 // NewIstioGatewaySource creates a new gatewaySource with the given config.
@@ -57,6 +58,7 @@ func NewIstioGatewaySource(
 	annotationFilter string,
 	fqdnTemplate string,
 	combineFqdnAnnotation bool,
+	ignoreHostnameAnnotation bool,
 ) (Source, error) {
 	var (
 		tmpl *template.Template
@@ -85,6 +87,7 @@ func NewIstioGatewaySource(
 		annotationFilter:         annotationFilter,
 		fqdnTemplate:             tmpl,
 		combineFQDNAnnotation:    combineFqdnAnnotation,
+		ignoreHostnameAnnotation: ignoreHostnameAnnotation,
 	}, nil
 }
 
@@ -265,10 +268,13 @@ func (sc *gatewaySource) endpointsFromGatewayConfig(config istiomodel.Config) ([
 		}
 	}
 
+	// Skip endpoints if we do not want entries from annotations
+	if !sc.ignoreHostnameAnnotation {
 		hostnameList := getHostnamesFromAnnotations(config.Annotations)
 		for _, hostname := range hostnameList {
 			endpoints = append(endpoints, endpointsForHostname(hostname, targets, ttl)...)
 		}
+	}
 
 	return endpoints, nil
 }

source/gateway_test.go

@@ -68,6 +68,7 @@ func (suite *GatewaySuite) SetupTest() {
 		"",
 		"{{.Name}}",
 		false,
+		false,
 	)
 	suite.NoError(err, "should initialize gateway source")
 
@@ -141,6 +142,7 @@ func TestNewIstioGatewaySource(t *testing.T) {
 				ti.annotationFilter,
 				ti.fqdnTemplate,
 				ti.combineFQDNAndAnnotation,
+				false,
 			)
 			if ti.expectError {
 				assert.Error(t, err)
@@ -273,6 +275,7 @@ func testGatewayEndpoints(t *testing.T) {
 		expectError              bool
 		fqdnTemplate             string
 		combineFQDNAndAnnotation bool
+		ignoreHostnameAnnotation bool
 	}{
 		{
 			title:           "no gateway",
@@ -913,6 +916,51 @@ func testGatewayEndpoints(t *testing.T) {
 			expected:     []*endpoint.Endpoint{},
 			fqdnTemplate: "{{.Name}}.ext-dns.test.com",
 		},
+		{
+			title:                    "ignore hostname annotations",
+			ignoreHostnameAnnotation: true,
+			targetNamespace:          "",
+			ingressGateway: fakeIngressGateway{
+				ips:       []string{"8.8.8.8"},
+				hostnames: []string{"lb.com"},
+			},
+			configItems: []fakeGatewayConfig{
+				{
+					name:      "fake1",
+					namespace: namespace,
+					annotations: map[string]string{
+						hostnameAnnotationKey: "ignore.me",
+					},
+					dnsnames: [][]string{{"example.org"}},
+				},
+				{
+					name:      "fake2",
+					namespace: namespace,
+					annotations: map[string]string{
+						hostnameAnnotationKey: "ignore.me.too",
+					},
+					dnsnames: [][]string{{"new.org"}},
+				},
+			},
+			expected: []*endpoint.Endpoint{
+				{
+					DNSName: "example.org",
+					Targets: endpoint.Targets{"8.8.8.8"},
+				},
+				{
+					DNSName: "example.org",
+					Targets: endpoint.Targets{"lb.com"},
+				},
+				{
+					DNSName: "new.org",
+					Targets: endpoint.Targets{"8.8.8.8"},
+				},
+				{
+					DNSName: "new.org",
+					Targets: endpoint.Targets{"lb.com"},
+				},
+			},
+		},
 	} {
 		t.Run(ti.title, func(t *testing.T) {
 			configs := make([]istiomodel.Config, 0)
@@ -939,6 +987,7 @@ func testGatewayEndpoints(t *testing.T) {
 				ti.annotationFilter,
 				ti.fqdnTemplate,
 				ti.combineFQDNAndAnnotation,
+				ti.ignoreHostnameAnnotation,
 			)
 			require.NoError(t, err)
 
@@ -972,6 +1021,7 @@ func newTestGatewaySource(ingress *v1.Service) (*gatewaySource, error) {
 		"",
 		"{{.Name}}",
 		false,
+		false,
 	)
 	if err != nil {
 		return nil, err

source/ingress.go

@@ -43,10 +43,11 @@ type ingressSource struct {
 	annotationFilter         string
 	fqdnTemplate             *template.Template
 	combineFQDNAnnotation    bool
+	ignoreHostnameAnnotation bool
 }
 
 // NewIngressSource creates a new ingressSource with the given config.
-func NewIngressSource(kubeClient kubernetes.Interface, namespace, annotationFilter string, fqdnTemplate string, combineFqdnAnnotation bool) (Source, error) {
+func NewIngressSource(kubeClient kubernetes.Interface, namespace, annotationFilter string, fqdnTemplate string, combineFqdnAnnotation bool, ignoreHostnameAnnotation bool) (Source, error) {
 	var (
 		tmpl *template.Template
 		err  error
@@ -66,6 +67,7 @@ func NewIngressSource(kubeClient kubernetes.Interface, namespace, annotationFilt
 		annotationFilter:         annotationFilter,
 		fqdnTemplate:             tmpl,
 		combineFQDNAnnotation:    combineFqdnAnnotation,
+		ignoreHostnameAnnotation: ignoreHostnameAnnotation,
 	}, nil
 }
 
@@ -92,7 +94,7 @@ func (sc *ingressSource) Endpoints() ([]*endpoint.Endpoint, error) {
 			continue
 		}
 
-		ingEndpoints := endpointsFromIngress(&ing)
+		ingEndpoints := endpointsFromIngress(&ing, sc.ignoreHostnameAnnotation)
 
 		// apply template if host is missing on ingress
 		if (sc.combineFQDNAnnotation || len(ingEndpoints) == 0) && sc.fqdnTemplate != nil {
@@ -194,7 +196,7 @@ func (sc *ingressSource) setResourceLabel(ingress v1beta1.Ingress, endpoints []*
 }
 
 // endpointsFromIngress extracts the endpoints from ingress object
-func endpointsFromIngress(ing *v1beta1.Ingress) []*endpoint.Endpoint {
+func endpointsFromIngress(ing *v1beta1.Ingress, ignoreHostnameAnnotation bool) []*endpoint.Endpoint {
 	var endpoints []*endpoint.Endpoint
 
 	ttl, err := getTTLFromAnnotations(ing.Annotations)
@@ -224,11 +226,13 @@ func endpointsFromIngress(ing *v1beta1.Ingress) []*endpoint.Endpoint {
 		}
 	}
 
+	// Skip endpoints if we do not want entries from annotations
+	if !ignoreHostnameAnnotation {
 		hostnameList := getHostnamesFromAnnotations(ing.Annotations)
 		for _, hostname := range hostnameList {
 			endpoints = append(endpoints, endpointsForHostname(hostname, targets, ttl)...)
 		}
-
+	}
 	return endpoints
 }
 

source/ingress_test.go

@@ -50,6 +50,7 @@ func (suite *IngressSuite) SetupTest() {
 		"",
 		"{{.Name}}",
 		false,
+		false,
 	)
 	suite.NoError(err, "should initialize ingress source")
 
@@ -123,6 +124,7 @@ func TestNewIngressSource(t *testing.T) {
 				ti.annotationFilter,
 				ti.fqdnTemplate,
 				ti.combineFQDNAndAnnotation,
+				false,
 			)
 			if ti.expectError {
 				assert.Error(t, err)
@@ -210,7 +212,7 @@ func testEndpointsFromIngress(t *testing.T) {
 	} {
 		t.Run(ti.title, func(t *testing.T) {
 			realIngress := ti.ingress.Ingress()
-			validateEndpoints(t, endpointsFromIngress(realIngress), ti.expected)
+			validateEndpoints(t, endpointsFromIngress(realIngress, false), ti.expected)
 		})
 	}
 }
@@ -226,6 +228,7 @@ func testIngressEndpoints(t *testing.T) {
 		expectError              bool
 		fqdnTemplate             string
 		combineFQDNAndAnnotation bool
+		ignoreHostnameAnnotation bool
 	}{
 		{
 			title:           "no ingress",
@@ -888,6 +891,38 @@ func testIngressEndpoints(t *testing.T) {
 			expected:     []*endpoint.Endpoint{},
 			fqdnTemplate: "{{.Name}}.ext-dns.test.com",
 		},
+		{
+			title:                    "ignore hostname annotation",
+			targetNamespace:          "",
+			ignoreHostnameAnnotation: true,
+			ingressItems: []fakeIngress{
+				{
+					name:      "fake1",
+					namespace: namespace,
+					dnsnames:  []string{"example.org"},
+					ips:       []string{"8.8.8.8"},
+				},
+				{
+					name:      "fake2",
+					namespace: namespace,
+					annotations: map[string]string{
+						hostnameAnnotationKey: "dns-through-hostname.com",
+					},
+					dnsnames:  []string{"new.org"},
+					hostnames: []string{"lb.com"},
+				},
+			},
+			expected: []*endpoint.Endpoint{
+				{
+					DNSName: "example.org",
+					Targets: endpoint.Targets{"8.8.8.8"},
+				},
+				{
+					DNSName: "new.org",
+					Targets: endpoint.Targets{"lb.com"},
+				},
+			},
+		},
 	} {
 		t.Run(ti.title, func(t *testing.T) {
 			ingresses := make([]*v1beta1.Ingress, 0)
@@ -902,6 +937,7 @@ func testIngressEndpoints(t *testing.T) {
 				ti.annotationFilter,
 				ti.fqdnTemplate,
 				ti.combineFQDNAndAnnotation,
+				ti.ignoreHostnameAnnotation,
 			)
 			for _, ingress := range ingresses {
 				_, err := fakeClient.Extensions().Ingresses(ingress.Namespace).Create(ingress)

source/service.go

@@ -51,13 +51,14 @@ type serviceSource struct {
 	compatibility            string
 	fqdnTemplate             *template.Template
 	combineFQDNAnnotation    bool
+	ignoreHostnameAnnotation bool
 	publishInternal          bool
 	publishHostIP            bool
 	serviceTypeFilter        map[string]struct{}
 }
 
 // NewServiceSource creates a new serviceSource with the given config.
-func NewServiceSource(kubeClient kubernetes.Interface, namespace, annotationFilter string, fqdnTemplate string, combineFqdnAnnotation bool, compatibility string, publishInternal bool, publishHostIP bool, serviceTypeFilter []string) (Source, error) {
+func NewServiceSource(kubeClient kubernetes.Interface, namespace, annotationFilter string, fqdnTemplate string, combineFqdnAnnotation bool, compatibility string, publishInternal bool, publishHostIP bool, serviceTypeFilter []string, ignoreHostnameAnnotation bool) (Source, error) {
 	var (
 		tmpl *template.Template
 		err  error
@@ -85,6 +86,7 @@ func NewServiceSource(kubeClient kubernetes.Interface, namespace, annotationFilt
 		compatibility:            compatibility,
 		fqdnTemplate:             tmpl,
 		combineFQDNAnnotation:    combineFqdnAnnotation,
+		ignoreHostnameAnnotation: ignoreHostnameAnnotation,
 		publishInternal:          publishInternal,
 		publishHostIP:            publishHostIP,
 		serviceTypeFilter:        serviceTypes,
@@ -230,10 +232,13 @@ func (sc *serviceSource) endpointsFromTemplate(svc *v1.Service, nodeTargets endp
 func (sc *serviceSource) endpoints(svc *v1.Service, nodeTargets endpoint.Targets) []*endpoint.Endpoint {
 	var endpoints []*endpoint.Endpoint
 
+	// Skip endpoints if we do not want entries from annotations
+	if !sc.ignoreHostnameAnnotation {
 		hostnameList := getHostnamesFromAnnotations(svc.Annotations)
 		for _, hostname := range hostnameList {
 			endpoints = append(endpoints, sc.generateEndpoints(svc, hostname, nodeTargets)...)
 		}
+	}
 
 	return endpoints
 }

source/service_test.go

@@ -51,6 +51,7 @@ func (suite *ServiceSuite) SetupTest() {
 		false,
 		false,
 		[]string{},
+		false,
 	)
 	suite.fooWithTargets = &v1.Service{
 		Spec: v1.ServiceSpec{
@@ -142,6 +143,7 @@ func testServiceSourceNewServiceSource(t *testing.T) {
 				false,
 				false,
 				ti.serviceTypesFilter,
+				false,
 			)
 
 			if ti.expectError {
@@ -165,6 +167,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 		compatibility            string
 		fqdnTemplate             string
 		combineFQDNAndAnnotation bool
+		ignoreHostnameAnnotation bool
 		labels                   map[string]string
 		annotations              map[string]string
 		clusterIP                string
@@ -183,6 +186,26 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
+			map[string]string{},
+			map[string]string{},
+			"",
+			[]string{"1.2.3.4"},
+			[]string{},
+			[]*endpoint.Endpoint{},
+			false,
+		},
+		{
+			"no annotated services return no endpoints when ignoreing annotations",
+			"",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeLoadBalancer,
+			"",
+			"",
+			false,
+			true,
 			map[string]string{},
 			map[string]string{},
 			"",
@@ -201,6 +224,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -213,6 +237,27 @@ func testServiceSourceEndpoints(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"hostname annotation on services is ignored",
+			"",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeLoadBalancer,
+			"",
+			"",
+			false,
+			true,
+			map[string]string{},
+			map[string]string{
+				hostnameAnnotationKey: "foo.example.org.",
+			},
+			"",
+			[]string{"1.2.3.4"},
+			[]string{},
+			[]*endpoint.Endpoint{},
+			false,
+		},
 		{
 			"annotated ClusterIp aren't processed without explicit authorization",
 			"",
@@ -223,6 +268,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -243,6 +289,29 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"{{.Name}}.fqdn.org,{{.Name}}.fqdn.com",
 			false,
+			false,
+			map[string]string{},
+			map[string]string{},
+			"",
+			[]string{"1.2.3.4"},
+			[]string{},
+			[]*endpoint.Endpoint{
+				{DNSName: "foo.fqdn.org", Targets: endpoint.Targets{"1.2.3.4"}},
+				{DNSName: "foo.fqdn.com", Targets: endpoint.Targets{"1.2.3.4"}},
+			},
+			false,
+		},
+		{
+			"FQDN template with multiple hostnames return an endpoint with target IP when ignoreing annotations",
+			"",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeLoadBalancer,
+			"",
+			"{{.Name}}.fqdn.org,{{.Name}}.fqdn.com",
+			false,
+			true,
 			map[string]string{},
 			map[string]string{},
 			"",
@@ -264,6 +333,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"{{.Name}}.fqdn.org,{{.Name}}.fqdn.com",
 			true,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org., bar.example.org.",
@@ -279,6 +349,30 @@ func testServiceSourceEndpoints(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"FQDN template and annotation both with multiple hostnames while ignoring annotations will only return FQDN endpoints",
+			"",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeLoadBalancer,
+			"",
+			"{{.Name}}.fqdn.org,{{.Name}}.fqdn.com",
+			true,
+			true,
+			map[string]string{},
+			map[string]string{
+				hostnameAnnotationKey: "foo.example.org., bar.example.org.",
+			},
+			"",
+			[]string{"1.2.3.4"},
+			[]string{},
+			[]*endpoint.Endpoint{
+				{DNSName: "foo.fqdn.org", Targets: endpoint.Targets{"1.2.3.4"}},
+				{DNSName: "foo.fqdn.com", Targets: endpoint.Targets{"1.2.3.4"}},
+			},
+			false,
+		},
 		{
 			"annotated services with multiple hostnames return an endpoint with target IP",
 			"",
@@ -289,6 +383,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org., bar.example.org.",
@@ -312,6 +407,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org, bar.example.org",
@@ -335,6 +431,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -357,6 +454,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org", // Trailing dot is omitted
@@ -380,6 +478,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				controllerAnnotationKey: controllerAnnotationValue,
@@ -403,6 +502,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"{{.Name}}.ext-dns.test.com",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				controllerAnnotationKey: "some-other-tool",
@@ -424,6 +524,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -446,6 +547,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -466,6 +568,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -488,6 +591,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey:                         "foo.example.org.",
@@ -511,6 +615,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey:                         "foo.example.org.",
@@ -532,6 +637,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey:                         "foo.example.org.",
@@ -553,6 +659,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey:                         "foo.example.org.",
@@ -576,6 +683,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey:                         "foo.example.org.",
@@ -597,6 +705,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -617,6 +726,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -639,6 +749,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				"zalando.org/dnsname": "foo.example.org.",
@@ -659,6 +770,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"mate",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				"zalando.org/dnsname": "foo.example.org.",
@@ -681,6 +793,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"molecule",
 			"",
 			false,
+			false,
 			map[string]string{
 				"dns": "route53",
 			},
@@ -706,6 +819,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"{{.Name}}.bar.example.com",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{},
 			"",
@@ -727,6 +841,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"{{.Name}}.bar.example.com",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -750,6 +865,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"mate",
 			"{{.Name}}.bar.example.com",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				"zalando.org/dnsname": "mate.example.org.",
@@ -772,6 +888,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"{{.Calibre}}.bar.example.com",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{},
 			"",
@@ -790,6 +907,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -812,6 +930,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -835,6 +954,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -858,6 +978,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -881,6 +1002,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -903,6 +1025,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 			"",
 			"",
 			false,
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -960,6 +1083,7 @@ func testServiceSourceEndpoints(t *testing.T) {
 				false,
 				false,
 				tc.serviceTypesFilter,
+				tc.ignoreHostnameAnnotation,
 			)
 			require.NoError(t, err)
 
@@ -987,6 +1111,7 @@ func TestClusterIpServices(t *testing.T) {
 		svcType                  v1.ServiceType
 		compatibility            string
 		fqdnTemplate             string
+		ignoreHostnameAnnotation bool
 		labels                   map[string]string
 		annotations              map[string]string
 		clusterIP                string
@@ -1003,6 +1128,7 @@ func TestClusterIpServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -1014,6 +1140,25 @@ func TestClusterIpServices(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"hostname annotated ClusterIp services are ignored",
+			"",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeClusterIP,
+			"",
+			"",
+			true,
+			map[string]string{},
+			map[string]string{
+				hostnameAnnotationKey: "foo.example.org.",
+			},
+			"1.2.3.4",
+			[]string{},
+			[]*endpoint.Endpoint{},
+			false,
+		},
 		{
 			"non-annotated ClusterIp services with set fqdnTemplate return an endpoint with target IP",
 			"",
@@ -1023,6 +1168,7 @@ func TestClusterIpServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"{{.Name}}.bar.example.com",
+			false,
 			map[string]string{},
 			map[string]string{},
 			"4.5.6.7",
@@ -1041,6 +1187,7 @@ func TestClusterIpServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{},
 			map[string]string{},
 			v1.ClusterIPNone,
@@ -1095,6 +1242,7 @@ func TestClusterIpServices(t *testing.T) {
 				true,
 				false,
 				[]string{},
+				tc.ignoreHostnameAnnotation,
 			)
 			require.NoError(t, err)
 
@@ -1122,6 +1270,7 @@ func TestNodePortServices(t *testing.T) {
 		svcType                  v1.ServiceType
 		compatibility            string
 		fqdnTemplate             string
+		ignoreHostnameAnnotation bool
 		labels                   map[string]string
 		annotations              map[string]string
 		lbs                      []string
@@ -1138,6 +1287,7 @@ func TestNodePortServices(t *testing.T) {
 			v1.ServiceTypeNodePort,
 			"",
 			"",
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -1170,6 +1320,45 @@ func TestNodePortServices(t *testing.T) {
 				},
 			}},
 		},
+		{
+			"hostname annotated NodePort services are ignored",
+			"",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeNodePort,
+			"",
+			"",
+			true,
+			map[string]string{},
+			map[string]string{
+				hostnameAnnotationKey: "foo.example.org.",
+			},
+			nil,
+			[]*endpoint.Endpoint{},
+			false,
+			[]*v1.Node{{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "node1",
+				},
+				Status: v1.NodeStatus{
+					Addresses: []v1.NodeAddress{
+						{Type: v1.NodeExternalIP, Address: "54.10.11.1"},
+						{Type: v1.NodeInternalIP, Address: "10.0.1.1"},
+					},
+				},
+			}, {
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "node2",
+				},
+				Status: v1.NodeStatus{
+					Addresses: []v1.NodeAddress{
+						{Type: v1.NodeExternalIP, Address: "54.10.11.2"},
+						{Type: v1.NodeInternalIP, Address: "10.0.1.2"},
+					},
+				},
+			}},
+		},
 		{
 			"non-annotated NodePort services with set fqdnTemplate return an endpoint with target IP",
 			"",
@@ -1179,6 +1368,7 @@ func TestNodePortServices(t *testing.T) {
 			v1.ServiceTypeNodePort,
 			"",
 			"{{.Name}}.bar.example.com",
+			false,
 			map[string]string{},
 			map[string]string{},
 			nil,
@@ -1218,6 +1408,7 @@ func TestNodePortServices(t *testing.T) {
 			v1.ServiceTypeNodePort,
 			"",
 			"",
+			false,
 			map[string]string{},
 			map[string]string{
 				hostnameAnnotationKey: "foo.example.org.",
@@ -1292,6 +1483,7 @@ func TestNodePortServices(t *testing.T) {
 				true,
 				false,
 				[]string{},
+				tc.ignoreHostnameAnnotation,
 			)
 			require.NoError(t, err)
 
@@ -1318,6 +1510,7 @@ func TestHeadlessServices(t *testing.T) {
 		svcType                  v1.ServiceType
 		compatibility            string
 		fqdnTemplate             string
+		ignoreHostnameAnnotation bool
 		labels                   map[string]string
 		annotations              map[string]string
 		clusterIP                string
@@ -1338,6 +1531,7 @@ func TestHeadlessServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1357,6 +1551,31 @@ func TestHeadlessServices(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"hostname annotated Headless services are ignored",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeClusterIP,
+			"",
+			"",
+			true,
+			map[string]string{"component": "foo"},
+			map[string]string{
+				hostnameAnnotationKey: "service.example.org",
+			},
+			v1.ClusterIPNone,
+			"1.1.1.1",
+			map[string]string{
+				"component": "foo",
+			},
+			[]string{},
+			[]string{"foo-0", "foo-1"},
+			[]string{"foo-0", "foo-1"},
+			[]v1.PodPhase{v1.PodRunning, v1.PodRunning},
+			[]*endpoint.Endpoint{},
+			false,
+		},
 		{
 			"annotated Headless services return endpoints with TTL for each selected Pod",
 			"",
@@ -1365,6 +1584,7 @@ func TestHeadlessServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1393,6 +1613,7 @@ func TestHeadlessServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1419,6 +1640,7 @@ func TestHeadlessServices(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1493,6 +1715,7 @@ func TestHeadlessServices(t *testing.T) {
 				true,
 				false,
 				[]string{},
+				tc.ignoreHostnameAnnotation,
 			)
 			require.NoError(t, err)
 
@@ -1519,6 +1742,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 		svcType                  v1.ServiceType
 		compatibility            string
 		fqdnTemplate             string
+		ignoreHostnameAnnotation bool
 		labels                   map[string]string
 		annotations              map[string]string
 		clusterIP                string
@@ -1539,6 +1763,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1558,6 +1783,31 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"hostname annotated Headless services are ignored",
+			"",
+			"testing",
+			"foo",
+			v1.ServiceTypeClusterIP,
+			"",
+			"",
+			true,
+			map[string]string{"component": "foo"},
+			map[string]string{
+				hostnameAnnotationKey: "service.example.org",
+			},
+			v1.ClusterIPNone,
+			"1.1.1.1",
+			map[string]string{
+				"component": "foo",
+			},
+			[]string{},
+			[]string{"foo-0", "foo-1"},
+			[]string{"foo-0", "foo-1"},
+			[]v1.PodPhase{v1.PodRunning, v1.PodRunning},
+			[]*endpoint.Endpoint{},
+			false,
+		},
 		{
 			"annotated Headless services return endpoints with TTL for each selected Pod",
 			"",
@@ -1566,6 +1816,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1594,6 +1845,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1620,6 +1872,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 			v1.ServiceTypeClusterIP,
 			"",
 			"",
+			false,
 			map[string]string{"component": "foo"},
 			map[string]string{
 				hostnameAnnotationKey: "service.example.org",
@@ -1694,6 +1947,7 @@ func TestHeadlessServicesHostIP(t *testing.T) {
 				true,
 				true,
 				[]string{},
+				tc.ignoreHostnameAnnotation,
 			)
 			require.NoError(t, err)
 
@@ -1734,7 +1988,7 @@ func BenchmarkServiceEndpoints(b *testing.B) {
 	_, err := kubernetes.CoreV1().Services(service.Namespace).Create(service)
 	require.NoError(b, err)
 
-	client, err := NewServiceSource(kubernetes, v1.NamespaceAll, "", "", false, "", false, false, []string{})
+	client, err := NewServiceSource(kubernetes, v1.NamespaceAll, "", "", false, "", false, false, []string{}, false)
 	require.NoError(b, err)
 
 	for i := 0; i < b.N; i++ {

source/store.go

@@ -42,6 +42,7 @@ type Config struct {
 	AnnotationFilter         string
 	FQDNTemplate             string
 	CombineFQDNAndAnnotation bool
+	IgnoreHostnameAnnotation bool
 	Compatibility            string
 	PublishInternal          bool
 	PublishHostIP            bool
@@ -112,13 +113,13 @@ func BuildWithConfig(source string, p ClientGenerator, cfg *Config) (Source, err
 		if err != nil {
 			return nil, err
 		}
-		return NewServiceSource(client, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation, cfg.Compatibility, cfg.PublishInternal, cfg.PublishHostIP, cfg.ServiceTypeFilter)
+		return NewServiceSource(client, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation, cfg.Compatibility, cfg.PublishInternal, cfg.PublishHostIP, cfg.ServiceTypeFilter, cfg.IgnoreHostnameAnnotation)
 	case "ingress":
 		client, err := p.KubeClient()
 		if err != nil {
 			return nil, err
 		}
-		return NewIngressSource(client, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation)
+		return NewIngressSource(client, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation, cfg.IgnoreHostnameAnnotation)
 	case "istio-gateway":
 		kubernetesClient, err := p.KubeClient()
 		if err != nil {
@@ -128,7 +129,7 @@ func BuildWithConfig(source string, p ClientGenerator, cfg *Config) (Source, err
 		if err != nil {
 			return nil, err
 		}
-		return NewIstioGatewaySource(kubernetesClient, istioClient, cfg.IstioIngressGateway, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation)
+		return NewIstioGatewaySource(kubernetesClient, istioClient, cfg.IstioIngressGateway, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation, cfg.IgnoreHostnameAnnotation)
 	case "fake":
 		return NewFakeSource(cfg.FQDNTemplate)
 	case "connector":