Replace azure-metadata-* annotations with azure-tags

Author: vaspoz

docs/tutorials/azure.md

@@ -523,8 +523,7 @@ kind: Ingress
 metadata:
   name: my-ingress
   annotations:
-    external-dns.alpha.kubernetes.io/azure-metadata-cost-center: "12345"
-    external-dns.alpha.kubernetes.io/azure-metadata-owner: backend-team
+    external-dns.alpha.kubernetes.io/azure-tags: "cost-center=12345,owner=backend-team"
 spec:
   rules:
     - host: app.example.com
@@ -547,8 +546,7 @@ kind: HTTPRoute
 metadata:
   name: my-route
   annotations:
-    external-dns.alpha.kubernetes.io/azure-metadata-environment: production
-    external-dns.alpha.kubernetes.io/azure-metadata-app: myapp
+    external-dns.alpha.kubernetes.io/azure-tags: "environment=production,app=myapp"
 spec:
   parentRefs:
     - name: my-gateway
@@ -565,7 +563,7 @@ spec:
 ### Annotation Format
 
 Metadata annotations must follow the format:
-`external-dns.alpha.kubernetes.io/azure-metadata-<key>: <value>`
+`external-dns.alpha.kubernetes.io/azure-tags: "key1=value1,key2=value2"`
 
 ## Deploy ExternalDNS
 

source/annotations/annotations.go

@@ -37,6 +37,9 @@ var (
 	CloudflareRecordCommentKey  string
 	CloudflareTagsKey           string
 
+	// AzureTagsKey The annotation used for Azure DNS record tags
+	AzureTagsKey string
+
 	AWSPrefix        string
 	CoreDNSPrefix    string
 	SCWPrefix        string
@@ -80,6 +83,9 @@ func SetAnnotationPrefix(prefix string) {
 	CloudflareRecordCommentKey = AnnotationKeyPrefix + "cloudflare-record-comment"
 	CloudflareTagsKey = AnnotationKeyPrefix + "cloudflare-tags"
 
+	// Azure annotations
+	AzureTagsKey = AnnotationKeyPrefix + "azure-tags"
+
 	// Provider prefixes
 	AWSPrefix = AnnotationKeyPrefix + "aws-"
 	CoreDNSPrefix = AnnotationKeyPrefix + "coredns-"

source/annotations/provider_specific.go

@@ -54,11 +54,25 @@ func ProviderSpecificAnnotations(annotations map[string]string) (endpoint.Provid
 				Name:  fmt.Sprintf("coredns/%s", attr),
 				Value: v,
 			})
-		} else if attr, ok := strings.CutPrefix(k, AzurePrefix); ok {
-			providerSpecificAnnotations = append(providerSpecificAnnotations, endpoint.ProviderSpecificProperty{
-				Name:  fmt.Sprintf("azure/%s", attr),
-				Value: v,
-			})
+		} else if k == AzureTagsKey {
+			// Parse azure-tags annotation (key1=value1,key2=value2)
+			for _, tag := range strings.Split(v, ",") {
+				tag = strings.TrimSpace(tag)
+				if tag == "" {
+					continue
+				}
+				parts := strings.SplitN(tag, "=", 2)
+				if len(parts) == 2 {
+					key := strings.TrimSpace(parts[0])
+					value := strings.TrimSpace(parts[1])
+					if key != "" && value != "" {
+						providerSpecificAnnotations = append(providerSpecificAnnotations, endpoint.ProviderSpecificProperty{
+							Name:  fmt.Sprintf("azure/metadata-%s", key),
+							Value: value,
+						})
+					}
+				}
+			}
 		} else if strings.HasPrefix(k, CloudflarePrefix) {
 			switch {
 			case strings.Contains(k, CloudflareCustomHostnameKey):

source/annotations/provider_specific_test.go

@@ -82,11 +82,23 @@ func TestProviderSpecificAnnotations(t *testing.T) {
 			setIdentifier: "",
 		},
 		{
-			name: "Azure metadata annotation",
+			name: "Azure tags annotation",
 			annotations: map[string]string{
-				"external-dns.alpha.kubernetes.io/azure-metadata-environment": "production",
+				AzureTagsKey: "cost-center=12345,owner=backend-team",
 			},
 			expected: endpoint.ProviderSpecific{
+				{Name: "azure/metadata-cost-center", Value: "12345"},
+				{Name: "azure/metadata-owner", Value: "backend-team"},
+			},
+			setIdentifier: "",
+		},
+		{
+			name: "Azure tags annotation with spaces",
+			annotations: map[string]string{
+				AzureTagsKey: "environment=production, app=myapp ",
+			},
+			expected: endpoint.ProviderSpecific{
+				{Name: "azure/metadata-app", Value: "myapp"},
 				{Name: "azure/metadata-environment", Value: "production"},
 			},
 			setIdentifier: "",
@@ -375,19 +387,6 @@ func TestGetProviderSpecificIdentifierAnnotations(t *testing.T) {
 			},
 			expectedIdentifier: "id1",
 		},
-		{
-			title: "azure- provider specific annotations are set correctly",
-			annotations: map[string]string{
-				"external-dns.alpha.kubernetes.io/azure-metadata-foo": "bar",
-				SetIdentifierKey: "id1",
-				"external-dns.alpha.kubernetes.io/azure-metadata-baz": "qux",
-			},
-			expectedResult: map[string]string{
-				"azure/metadata-foo": "bar",
-				"azure/metadata-baz": "qux",
-			},
-			expectedIdentifier: "id1",
-		},
 	} {
 		t.Run(tc.title, func(t *testing.T) {
 			providerSpecificAnnotations, identifier := ProviderSpecificAnnotations(tc.annotations)