upgrade addon-framework (#828)

Signed-off-by: Qing Hao <qhao@redhat.com>
open-cluster-management-io · Feb 19, 2025 · a8a40e5 · a8a40e5
1 parent b94d7da
commit a8a40e5
Show file tree

Hide file tree

Showing 9 changed files with 173 additions and 76 deletions.
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-aggregator v0.31.4
 	k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
-	open-cluster-management.io/addon-framework v0.11.1-0.20241129080247-57b1d2859f50
+	open-cluster-management.io/addon-framework v0.11.1-0.20250218075422-4329ebea390c
 	open-cluster-management.io/api v0.15.1-0.20250116010516-3a595d6a4e40
 	open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
 	sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848

diff --git a/go.sum b/go.sum
@@ -487,8 +487,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
 k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
 k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-open-cluster-management.io/addon-framework v0.11.1-0.20241129080247-57b1d2859f50 h1:TXRd6OdGjArh6cwlCYOqlIcyx21k81oUIYj4rmHlYx0=
-open-cluster-management.io/addon-framework v0.11.1-0.20241129080247-57b1d2859f50/go.mod h1:tsBSNs9mGfVQQjXBnjgpiX6r0UM+G3iNfmzQgKhEfw4=
+open-cluster-management.io/addon-framework v0.11.1-0.20250218075422-4329ebea390c h1:Lyv5mhYDMRFj03OqAuBldLppUKSqf+WiemafiG0wzwc=
+open-cluster-management.io/addon-framework v0.11.1-0.20250218075422-4329ebea390c/go.mod h1:3+UAkReHIEyqsDuq0Iv5w+ZRgZr254iehYV/JR2j038=
 open-cluster-management.io/api v0.15.1-0.20250116010516-3a595d6a4e40 h1:LckTHZ68rcy3hDFu6wa7BVOJ9wbWItJLZXmi0bpMyh8=
 open-cluster-management.io/api v0.15.1-0.20250116010516-3a595d6a4e40/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
 open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f h1:zeC7QrFNarfK2zY6jGtd+mX+yDrQQmnH/J8A7n5Nh38=

diff --git a/test/integration/addon/addon_configs_test.go b/test/integration/addon/addon_configs_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/rand"
 
 	addonapiv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
@@ -412,20 +411,6 @@ var _ = ginkgo.Describe("AddConfigs", func() {
 	})
 
 	ginkgo.It("Should not update unsupported config spec hash", func() {
-		addOnConfig := &addonapiv1alpha1.AddOnDeploymentConfig{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "addon-config",
-				Namespace: managedClusterName,
-			},
-			Spec: addOnTest1ConfigSpec,
-		}
-		_, err = hubAddonClient.AddonV1alpha1().AddOnDeploymentConfigs(managedClusterName).Create(context.Background(), addOnConfig, metav1.CreateOptions{})
-		gomega.Expect(err).ToNot(gomega.HaveOccurred())
-
-		// empty supported config
-		supportedConfig := testAddOnConfigsImpl.supportedConfigGVRs
-		testAddOnConfigsImpl.supportedConfigGVRs = []schema.GroupVersionResource{}
-
 		// do not update mca status.SupportedConfigs
 		addon := &addonapiv1alpha1.ManagedClusterAddOn{
 			ObjectMeta: metav1.ObjectMeta{
@@ -437,12 +422,12 @@ var _ = ginkgo.Describe("AddConfigs", func() {
 				Configs: []addonapiv1alpha1.AddOnConfig{
 					{
 						ConfigGroupResource: addonapiv1alpha1.ConfigGroupResource{
-							Group:    addOnDeploymentConfigGVR.Group,
-							Resource: addOnDeploymentConfigGVR.Resource,
+							Group:    addOnDeploymentConfigGVR.Group + "test",
+							Resource: addOnDeploymentConfigGVR.Resource + "test",
 						},
 						ConfigReferent: addonapiv1alpha1.ConfigReferent{
-							Name:      addOnConfig.Name,
-							Namespace: addOnConfig.Namespace,
+							Name:      "addon-config-test",
+							Namespace: managedClusterName,
 						},
 					},
 				},
@@ -451,42 +436,41 @@ var _ = ginkgo.Describe("AddConfigs", func() {
 		_, err = hubAddonClient.AddonV1alpha1().ManagedClusterAddOns(managedClusterName).Create(context.Background(), addon, metav1.CreateOptions{})
 		gomega.Expect(err).ToNot(gomega.HaveOccurred())
 
-		// check cma status
-		assertClusterManagementAddOnDefaultConfigReferences(testAddOnConfigsImpl.name, addonapiv1alpha1.DefaultConfigReference{
+		// check mca status
+		assertManagedClusterAddOnConfigReferences(testAddOnConfigsImpl.name, managedClusterName, addonapiv1alpha1.ConfigReference{
 			ConfigGroupResource: addonapiv1alpha1.ConfigGroupResource{
 				Group:    addOnDeploymentConfigGVR.Group,
 				Resource: addOnDeploymentConfigGVR.Resource,
 			},
+			ConfigReferent: addonapiv1alpha1.ConfigReferent{
+				Namespace: configDefaultNamespace,
+				Name:      configDefaultName,
+			},
+			LastObservedGeneration: 1,
 			DesiredConfig: &addonapiv1alpha1.ConfigSpecHash{
 				ConfigReferent: addonapiv1alpha1.ConfigReferent{
 					Namespace: configDefaultNamespace,
 					Name:      configDefaultName,
 				},
 				SpecHash: addOnDefaultConfigSpecHash,
 			},
-		})
-		assertClusterManagementAddOnInstallProgression(testAddOnConfigsImpl.name)
-
-		// check mca status
-		assertManagedClusterAddOnConfigReferences(testAddOnConfigsImpl.name, managedClusterName, addonapiv1alpha1.ConfigReference{
+		}, addonapiv1alpha1.ConfigReference{
 			ConfigGroupResource: addonapiv1alpha1.ConfigGroupResource{
-				Group:    addOnDeploymentConfigGVR.Group,
-				Resource: addOnDeploymentConfigGVR.Resource,
+				Group:    addOnDeploymentConfigGVR.Group + "test",
+				Resource: addOnDeploymentConfigGVR.Resource + "test",
 			},
 			ConfigReferent: addonapiv1alpha1.ConfigReferent{
-				Namespace: addOnConfig.Namespace,
-				Name:      addOnConfig.Name,
+				Namespace: managedClusterName,
+				Name:      "addon-config-test",
 			},
-			LastObservedGeneration: 1,
+			LastObservedGeneration: 0,
 			DesiredConfig: &addonapiv1alpha1.ConfigSpecHash{
 				ConfigReferent: addonapiv1alpha1.ConfigReferent{
-					Namespace: addOnConfig.Namespace,
-					Name:      addOnConfig.Name,
+					Namespace: managedClusterName,
+					Name:      "addon-config-test",
 				},
 				SpecHash: "",
 			},
 		})
-
-		testAddOnConfigsImpl.supportedConfigGVRs = supportedConfig
 	})
 })
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1691,7 +1691,7 @@ k8s.io/utils/pointer
 k8s.io/utils/ptr
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# open-cluster-management.io/addon-framework v0.11.1-0.20241129080247-57b1d2859f50
+# open-cluster-management.io/addon-framework v0.11.1-0.20250218075422-4329ebea390c
 ## explicit; go 1.22.0
 open-cluster-management.io/addon-framework/pkg/addonfactory
 open-cluster-management.io/addon-framework/pkg/addonmanager

diff --git a/vendor/open-cluster-management.io/addon-framework/pkg/addonfactory/addondeploymentconfig.go b/vendor/open-cluster-management.io/addon-framework/pkg/addonfactory/addondeploymentconfig.go
diff --git a/...ster-management.io/addon-framework/pkg/addonmanager/controllers/addonconfig/controller.go b/...ster-management.io/addon-framework/pkg/addonmanager/controllers/addonconfig/controller.go
diff --git a/...anagement.io/addon-framework/pkg/addonmanager/controllers/agentdeploy/healthcheck_sync.go b/...anagement.io/addon-framework/pkg/addonmanager/controllers/agentdeploy/healthcheck_sync.go
diff --git a/...ter-management.io/addon-framework/pkg/addonmanager/controllers/registration/controller.go b/...ter-management.io/addon-framework/pkg/addonmanager/controllers/registration/controller.go