drop intermediate DNSBaseStatus

gardener · Dec 4, 2024 · 129f485 · 129f485
1 parent 8df662c
commit 129f485
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 113 deletions.
diff --git a/charts/external-dns-management/templates/crds.yaml b/charts/external-dns-management/templates/crds.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsentries.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -249,7 +249,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsannotations.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -362,7 +362,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsowners.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -464,7 +464,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsproviders.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -686,7 +686,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnshostedzonepolicies.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/crds/dns.gardener.cloud_dnsannotations.yaml b/pkg/apis/dns/crds/dns.gardener.cloud_dnsannotations.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsannotations.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/crds/dns.gardener.cloud_dnsentries.yaml b/pkg/apis/dns/crds/dns.gardener.cloud_dnsentries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsentries.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/crds/dns.gardener.cloud_dnshostedzonepolicies.yaml b/pkg/apis/dns/crds/dns.gardener.cloud_dnshostedzonepolicies.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnshostedzonepolicies.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/crds/dns.gardener.cloud_dnsowners.yaml b/pkg/apis/dns/crds/dns.gardener.cloud_dnsowners.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsowners.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/crds/dns.gardener.cloud_dnsproviders.yaml b/pkg/apis/dns/crds/dns.gardener.cloud_dnsproviders.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsproviders.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/crds/zz_generated_crds.go b/pkg/apis/dns/crds/zz_generated_crds.go
@@ -19,7 +19,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsannotations.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -130,7 +130,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsentries.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -368,7 +368,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnshostedzonepolicies.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -495,7 +495,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsowners.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud
@@ -595,7 +595,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: dnsproviders.dns.gardener.cloud
 spec:
   group: dns.gardener.cloud

diff --git a/pkg/apis/dns/v1alpha1/dnsentry.go b/pkg/apis/dns/v1alpha1/dnsentry.go
@@ -79,19 +79,6 @@ type DNSEntrySpec struct {
 }
 
 type DNSEntryStatus struct {
-	DNSBaseStatus `json:",inline"`
-	// effective targets generated for the entry
-	// +optional
-	Targets []string `json:"targets,omitempty"`
-	// effective routing policy
-	// +optional
-	RoutingPolicy *RoutingPolicy `json:"routingPolicy,omitempty"`
-	// effective lookup interval for CNAMEs that must be resolved to IP addresses
-	// +optional
-	CNameLookupInterval *int64 `json:"cnameLookupInterval,omitempty"`
-}
-
-type DNSBaseStatus struct {
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 	// entry state
@@ -115,6 +102,15 @@ type DNSBaseStatus struct {
 	// time to live used for the entry
 	// +optional
 	TTL *int64 `json:"ttl,omitempty"`
+	// effective targets generated for the entry
+	// +optional
+	Targets []string `json:"targets,omitempty"`
+	// effective routing policy
+	// +optional
+	RoutingPolicy *RoutingPolicy `json:"routingPolicy,omitempty"`
+	// effective lookup interval for CNAMEs that must be resolved to IP addresses
+	// +optional
+	CNameLookupInterval *int64 `json:"cnameLookupInterval,omitempty"`
 }
 
 type EntryReference struct {

diff --git a/pkg/apis/dns/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/dns/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/dns/provider/changemodel.go b/pkg/dns/provider/changemodel.go
@@ -101,7 +101,7 @@ func (this *ChangeGroup) cleanup(logger logger.LogContext, model *ChangeModel) b
 					if e.IsDeleting() {
 						model.failedDNSNames.Add(s.Name) // preventing deletion of stale entry
 					}
-					status := e.Object().BaseStatus()
+					status := e.Object().Status()
 					msg := MSG_PRESERVED
 					trigger := false
 					if status.State == api.STATE_ERROR || status.State == api.STATE_INVALID {