deprecate alb annotation and promote new one

Author: speruri

kubernetes/adapter.go

@@ -203,13 +203,18 @@ func (a *Adapter) newIngress(typ IngressType, metadata kubeItemMetadata, host st
 	}
 
 	ipAddressType := a.ingressIpAddressType
-	if annotation := getAnnotationsString(annotations, ingressALBIPAddressType, ""); annotation == aws.IPAddressTypeDualstack {
-		ipAddressType = aws.IPAddressTypeDualstack
-	} else if annotation == aws.IPAddressTypeIPV4 {
-		ipAddressType = aws.IPAddressTypeIPV4
+	ingressALBAnnotation := getAnnotationsString(annotations, ingressALBIPAddressType, "")
+	if ingressALBAnnotation != "" {
+		log.Warnf("Deprecated annotation %q in use for %q resource named %q in namespace %q", ingressALBIPAddressType, typ, metadata.Name, metadata.Namespace)
+		switch ingressALBAnnotation {
+		case aws.IPAddressTypeDualstack:
+			ipAddressType = aws.IPAddressTypeDualstack
+		case aws.IPAddressTypeIPV4:
+			ipAddressType = aws.IPAddressTypeIPV4
+		}
 	}
 
-	if annotation := getAnnotationsString(annotations, ingressNLBIPAddressType, ""); annotation == aws.IPAddressTypeDualstack {
+	if annotation := getAnnotationsString(annotations, ingressIPAddressType, ""); annotation == aws.IPAddressTypeDualstack {
 		ipAddressType = aws.IPAddressTypeDualstack
 	} else if annotation == aws.IPAddressTypeIPV4 {
 		ipAddressType = aws.IPAddressTypeIPV4

kubernetes/ingress.go

@@ -60,9 +60,10 @@ type ingressLoadBalancer struct {
 }
 
 const (
+	// deprecated, use ingressIPAddressType instead
 	// ingressALBIPAddressType is used in external-dns, https://github.com/kubernetes-incubator/external-dns/pull/1079
 	ingressALBIPAddressType           = "alb.ingress.kubernetes.io/ip-address-type"
-	ingressNLBIPAddressType           = "nlb.ingress.kubernetes.io/ip-address-type"
+	ingressIPAddressType              = "ingress.kubernetes.io/ip-address-type"
 	IngressAPIVersionExtensions       = "extensions/v1beta1"
 	IngressAPIVersionNetworking       = "networking.k8s.io/v1"
 	ingressListResource               = "/apis/%s/ingresses"