Don't require version to be set

k0da · k0da · commit 65b212c1a557 · 2025-07-21T14:29:30.000+02:00
Skip equal test if version is unset

Signed-off-by: Dinar Valeev &lt;k0da@opensuse.org&gt;
diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
@@ -120,7 +120,6 @@ spec:
                       type: string
                   required:
                   - name
-                  - version
                   type: object
                 type: array
               associateOIDCProvider:
diff --git a/controlplane/eks/api/v1beta1/types.go b/controlplane/eks/api/v1beta1/types.go
@@ -144,6 +144,7 @@ type Addon struct {
 	// +kubebuilder:validation:Required
 	Name string `json:"name"`
 	// Version is the version of the addon to use
+	// +optional
 	Version string `json:"version"`
 	// Configuration of the EKS addon
 	// +optional
diff --git a/pkg/eks/addons/types.go b/pkg/eks/addons/types.go
@@ -40,7 +40,7 @@ func (e *EKSAddon) IsEqual(other *EKSAddon, includeTags bool) bool {
 	if e == other {
 		return true
 	}
-	if !cmp.Equal(e.Version, other.Version) {
+	if !cmp.Equal(e.Version, other.Version) && e.Version != nil {
 		return false
 	}
 	if !cmp.Equal(e.ServiceAccountRoleARN, other.ServiceAccountRoleARN) {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (e EKSAddon) IsEqual(other EKSAddon, includeTags bool) bool {`
`40`	`40`	`if e == other {`
`41`	`41`	`return true`
`42`	`42`	`}`
`43`		`- if !cmp.Equal(e.Version, other.Version) {`
	`43`	`+ if !cmp.Equal(e.Version, other.Version) && e.Version != nil {`
`44`	`44`	`return false`
`45`	`45`	`}`
`46`	`46`	`if !cmp.Equal(e.ServiceAccountRoleARN, other.ServiceAccountRoleARN) {`