Don't require version to be set

Skip equal test if version is unset
Skip empty conflict and Configurations

Signed-off-by: Dinar Valeev <[email protected]>

Author: k0da

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:

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

pkg/eks/addons/plan_test.go

@@ -35,6 +35,7 @@ func TestEKSAddonPlan(t *testing.T) {
 	addonARN := "aws://someaddonarn"
 	addon1Name := "addon1"
 	addon1version := "1.0.0"
+	addon1versionNotSet := ""
 	addon1Upgrade := "2.0.0"
 	addonStatusActive := string(eks.AddonStatusActive)
 	addonStatusUpdating := string(eks.AddonStatusUpdating)
@@ -179,6 +180,20 @@ func TestEKSAddonPlan(t *testing.T) {
 			expectCreateError: false,
 			expectDoError:     false,
 		},
+		{
+			name: "1 installed and 1 desired - both same and installed active",
+			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
+				// No Action expected
+			},
+			desiredAddons: []*EKSAddon{
+				createDesiredAddon(addon1Name, addon1versionNotSet),
+			},
+			installedAddons: []*EKSAddon{
+				createInstalledAddon(addon1Name, addon1version, addonARN, addonStatusActive),
+			},
+			expectCreateError: false,
+			expectDoError:     false,
+		},
 		{
 			name: "1 installed and 1 desired - both same and installed is creating",
 			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {

pkg/eks/addons/types.go

@@ -40,16 +40,16 @@ 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 != "" {
 		return false
 	}
 	if !cmp.Equal(e.ServiceAccountRoleARN, other.ServiceAccountRoleARN) {
 		return false
 	}
-	if !cmp.Equal(e.Configuration, other.Configuration) {
+	if !cmp.Equal(e.Configuration, other.Configuration) && other.Configuration != nil {
 		return false
 	}
-	if !cmp.Equal(e.ResolveConflict, other.ResolveConflict) {
+	if !cmp.Equal(e.ResolveConflict, other.ResolveConflict) && other.ResolveConflict != nil {
 		return false
 	}