fix externaldns crd required fields (#366)

Azure · Feb 14, 2025 · 20a88be · 20a88be
1 parent 4e83743
commit 20a88be
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 14 deletions.
diff --git a/api/v1alpha1/clusterexternaldns_types.go b/api/v1alpha1/clusterexternaldns_types.go
@@ -38,11 +38,11 @@ func (c *ClusterExternalDNS) SetCondition(condition metav1.Condition) {
 // ClusterExternalDNSSpec allows users to specify desired the state of a cluster-scoped ExternalDNS deployment.
 type ClusterExternalDNSSpec struct {
 	// ResourceName is the name that will be used for the ExternalDNS deployment and related resources. Will default to the name of the ClusterExternalDNS resource if not specified.
+	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=253
 	// +kubebuilder:validation:Pattern=`^[a-z0-9][-a-z0-9\.]*[a-z0-9]$`
-	// +kubebuilder:validation:Required
-	ResourceName string `json:"resourceName,omitempty"`
+	ResourceName string `json:"resourceName"`
 
 	// TenantID is the ID of the Azure tenant where the DNS zones are located.
 	// +kubebuilder:validation:Required

diff --git a/api/v1alpha1/externaldns_types.go b/api/v1alpha1/externaldns_types.go
@@ -53,7 +53,7 @@ type ExternalDNSSpec struct {
 	// +kubebuilder:validation:MaxLength=253
 	// +kubebuilder:validation:Pattern=`^[a-z0-9][-a-z0-9\.]*[a-z0-9]$`
 	// +kubebuilder:validation:Required
-	ResourceName string `json:"resourceName,omitempty"`
+	ResourceName string `json:"resourceName"`
 
 	// TenantID is the ID of the Azure tenant where the DNS zones are located.
 	// +kubebuilder:validation:Required

diff --git a/config/crd/bases/approuting.kubernetes.azure.com_clusterexternaldnses.yaml b/config/crd/bases/approuting.kubernetes.azure.com_clusterexternaldnses.yaml
@@ -133,6 +133,7 @@ spec:
             required:
             - dnsZoneResourceIDs
             - identity
+            - resourceName
             - resourceNamespace
             - resourceTypes
             - tenantID

diff --git a/config/crd/bases/approuting.kubernetes.azure.com_externaldnses.yaml b/config/crd/bases/approuting.kubernetes.azure.com_externaldnses.yaml
@@ -126,6 +126,7 @@ spec:
             required:
             - dnsZoneResourceIDs
             - identity
+            - resourceName
             - resourceTypes
             - tenantID
             type: object

diff --git a/testing/e2e/suites/clusterexternaldns_crd.go b/testing/e2e/suites/clusterexternaldns_crd.go
@@ -25,6 +25,7 @@ func validClusterExternalDNS() *v1alpha1.ClusterExternalDNS {
 			Name: "test",
 		},
 		Spec: v1alpha1.ClusterExternalDNSSpec{
+			ResourceName:      "test",
 			ResourceNamespace: "default",
 			TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 			DNSZoneResourceIDs: []string{
@@ -97,6 +98,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "invalid-tenant",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "test",
 								DNSZoneResourceIDs: []string{
@@ -121,6 +123,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "no-tenant",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174001/resourceGroups/test/providers/Microsoft.network/dnszones/test",
@@ -145,6 +148,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174001/resourceGroups/test/providers/Microsoft.network/dnszones/test",
@@ -169,6 +173,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "diff-type",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -194,6 +199,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "duplicate-zones",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -219,6 +225,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "diff-rg",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -266,6 +273,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "no-resourcetypes",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -290,6 +298,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "empty-resourcetypes",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -315,6 +324,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "invalid-resourcetypes",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -340,6 +350,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 								Name: "no-identity",
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
@@ -363,6 +374,7 @@ func clusterExternalDnsCrdTests(in infra.Provisioned) []test {
 							},
 							Spec: v1alpha1.ClusterExternalDNSSpec{
 								TenantID:          "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName:      "test",
 								ResourceNamespace: "default",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",

diff --git a/testing/e2e/suites/externaldns_crd.go b/testing/e2e/suites/externaldns_crd.go
@@ -26,7 +26,8 @@ func validExternalDNS() *v1alpha1.ExternalDNS {
 			Namespace: "default",
 		},
 		Spec: v1alpha1.ExternalDNSSpec{
-			TenantID: "123e4567-e89b-12d3-a456-426614174000",
+			ResourceName: "test",
+			TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 			DNSZoneResourceIDs: []string{
 				"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 				"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",
@@ -74,7 +75,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "test",
+								ResourceName: "test",
+								TenantID:     "test",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174001/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 								},
@@ -98,6 +100,7 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
+								ResourceName: "test",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174001/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 								},
@@ -121,7 +124,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174001/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",
@@ -146,7 +150,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/privatednszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
@@ -171,7 +176,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
@@ -196,7 +202,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test2/providers/Microsoft.network/dnszones/test2",
@@ -221,6 +228,7 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
+								ResourceName:       "test",
 								TenantID:           "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{},
 								ResourceTypes:      []string{"ingress", "gateway"},
@@ -243,7 +251,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",
@@ -267,7 +276,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",
@@ -292,7 +302,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",
@@ -317,7 +328,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",
@@ -339,7 +351,8 @@ func externalDnsCrdTests(in infra.Provisioned) []test {
 								Namespace: "default",
 							},
 							Spec: v1alpha1.ExternalDNSSpec{
-								TenantID: "123e4567-e89b-12d3-a456-426614174000",
+								ResourceName: "test",
+								TenantID:     "123e4567-e89b-12d3-a456-426614174000",
 								DNSZoneResourceIDs: []string{
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test",
 									"/subscriptions/123e4567-e89b-12d3-a456-426614174000/resourceGroups/test/providers/Microsoft.network/dnszones/test2",