modify helloworld addon

Signed-off-by: haoqing0110 <[email protected]>

cmd/example/helloworld/main.go

@@ -108,6 +108,12 @@ func runController(ctx context.Context, kubeConfig *rest.Config) error {
 			),
 		).
 		WithAgentRegistrationOption(registrationOption).
+		WithAgentInstallNamespace(
+			// Set agent install namespace from addon deployment config if it exists
+			utils.AgentInstallNamespaceFromDeploymentConfigFunc(
+				utils.NewAddOnDeploymentConfigGetter(addonClient),
+			),
+		).
 		WithAgentHealthProber(helloworld.AgentHealthProber()).
 		BuildTemplateAgentAddon()
 	if err != nil {

cmd/example/helloworld_helm/main.go

@@ -115,12 +115,12 @@ func runController(ctx context.Context, kubeConfig *rest.Config) error {
 		WithGetValuesFuncs(
 			helloworld_helm.GetDefaultValues,
 			addonfactory.GetAddOnDeploymentConfigValues(
-				addonfactory.NewAddOnDeploymentConfigGetter(addonClient),
+				utils.NewAddOnDeploymentConfigGetter(addonClient),
 				addonfactory.ToAddOnNodePlacementValues,
 				addonfactory.ToAddOnProxyConfigValues,
 			),
 			addonfactory.GetAgentImageValues(
-				addonfactory.NewAddOnDeploymentConfigGetter(addonClient),
+				utils.NewAddOnDeploymentConfigGetter(addonClient),
 				"global.imageOverrides.helloWorldHelm",
 				helloworld.DefaultHelloWorldExampleImage,
 			),

examples/deploy/addon/helloworld-helm/resources/helloworld_helm_clustermanagementaddon.yaml

@@ -2,6 +2,8 @@ apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
   name: helloworldhelm
+  annotations:
+   addon.open-cluster-management.io/lifecycle: addon-manager
 spec:
   addOnMeta:
     displayName: helloworldhelm

examples/deploy/addon/helloworld-hosted/resources/helloworld_hosted_clustermanagementaddon.yaml

@@ -2,6 +2,8 @@ apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
   name: helloworldhosted
+  annotations:
+   addon.open-cluster-management.io/lifecycle: addon-manager
 spec:
   addOnMeta:
     displayName: helloworldhosted

examples/deploy/addon/helloworld/kustomization.yaml

@@ -4,10 +4,12 @@ resources:
 - resources/cluster_role.yaml
 - resources/cluster_role_binding.yaml
 - resources/service_account.yaml
+- resources/managed_clusterset_binding.yaml
+- resources/placement.yaml
+- resources/addon_deployment_config.yaml
 - resources/helloworld_clustermanagementaddon.yaml
 - resources/helloworld_controller.yaml
 
-
 images:
 - name: quay.io/open-cluster-management/addon-examples
   newName: quay.io/open-cluster-management/addon-examples

examples/deploy/addon/helloworld/resources/addon_deployment_config.yaml

@@ -0,0 +1,6 @@
+apiVersion: addon.open-cluster-management.io/v1alpha1
+kind: AddOnDeploymentConfig
+metadata:
+  name: global
+spec:
+  agentInstallNamespace: default

examples/deploy/addon/helloworld/resources/helloworld_clustermanagementaddon.yaml

@@ -2,10 +2,22 @@ apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
   name: helloworld
+  annotations:
+   addon.open-cluster-management.io/lifecycle: addon-manager
 spec:
   addOnMeta:
     displayName: helloworld
     description: "helloworld is an example addon created by go template"
   supportedConfigs:
   - group: addon.open-cluster-management.io
     resource: addondeploymentconfigs
+  installStrategy:
+    type: Placements
+    placements:
+      - name: global
+        namespace: default
+        configs:
+          - group: addon.open-cluster-management.io
+            resource: addondeploymentconfigs
+            name: global
+            namespace: default

examples/deploy/addon/helloworld/resources/managed_clusterset_binding.yaml

@@ -0,0 +1,7 @@
+apiVersion: cluster.open-cluster-management.io/v1beta2
+kind: ManagedClusterSetBinding
+metadata:
+  name: global
+  namespace: default
+spec:
+  clusterSet: global

examples/deploy/addon/helloworld/resources/placement.yaml

@@ -0,0 +1,10 @@
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
+metadata:
+  name: global
+spec:
+  clusterSets:
+    - global
+  predicates:
+    - requiredClusterSelector:
+        labelSelector: {}

examples/helloworld/helloworld.go

@@ -30,7 +30,6 @@ func NewRegistrationOption(kubeConfig *rest.Config, addonName, agentName string)
 		CSRConfigurations: agent.KubeClientSignerConfigurations(addonName, agentName),
 		CSRApproveCheck:   utils.DefaultCSRApprover(agentName),
 		PermissionConfig:  rbac.AddonRBAC(kubeConfig),
-		Namespace:         InstallationNamespace,
 	}
 }
 

test/e2e/helloworld_helm_test.go

@@ -146,15 +146,15 @@ var _ = ginkgo.Describe("install/uninstall helloworld helm addons", func() {
 	})
 
 	ginkgo.It("addon should be available", func() {
-		ginkgo.By("Make sure cma annotation is not added since no install strategy defined")
+		ginkgo.By("Make sure cma annotation is added since no install strategy defined")
 		gomega.Eventually(func() error {
 			cma, err := hubAddOnClient.AddonV1alpha1().ClusterManagementAddOns().Get(context.Background(), helloWorldHelmAddonName, metav1.GetOptions{})
 			if err != nil {
 				return err
 			}
 
-			if _, exist := cma.Annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey]; exist {
-				return fmt.Errorf("addon should not have annotation, but get %v", cma.Annotations)
+			if cma.Annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey] != addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue {
+				return fmt.Errorf("addon should have annotation, but get %v", cma.Annotations)
 			}
 
 			return nil
@@ -338,7 +338,7 @@ var _ = ginkgo.Describe("install/uninstall helloworld helm addons", func() {
 
 		ginkgo.By("Make sure addon is configured")
 		gomega.Eventually(func() error {
-			agentDeploy, err := hubKubeClient.AppsV1().Deployments(addonInstallNamespace).Get(context.Background(), "helloworldhelm-agent", metav1.GetOptions{})
+			agentDeploy, err := hubKubeClient.AppsV1().Deployments(metav1.NamespaceDefault).Get(context.Background(), "helloworldhelm-agent", metav1.GetOptions{})
 			if err != nil {
 				return err
 			}
@@ -581,7 +581,7 @@ var _ = ginkgo.Describe("install/uninstall helloworld helm addons", func() {
 
 		ginkgo.By("Make sure addon is configured")
 		gomega.Eventually(func() error {
-			agentDeploy, err := hubKubeClient.AppsV1().Deployments(addonInstallNamespace).Get(
+			agentDeploy, err := hubKubeClient.AppsV1().Deployments(metav1.NamespaceDefault).Get(
 				context.Background(), "helloworldhelm-agent", metav1.GetOptions{})
 			if err != nil {
 				return err

test/e2e/helloworld_test.go

@@ -101,14 +101,14 @@ var _ = ginkgo.Describe("install/uninstall helloworld addons", func() {
 	})
 
 	ginkgo.It("addon should be worked", func() {
-		ginkgo.By("Make sure cma annotation managed by self is added")
+		ginkgo.By("Make sure cma annotation managed by addon-manager is added")
 		gomega.Eventually(func() error {
 			cma, err := hubAddOnClient.AddonV1alpha1().ClusterManagementAddOns().Get(context.Background(), addonName, metav1.GetOptions{})
 			if err != nil {
 				return err
 			}
 
-			if cma.Annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey] != addonapiv1alpha1.AddonLifecycleSelfManageAnnotationValue {
+			if cma.Annotations[addonapiv1alpha1.AddonLifecycleAnnotationKey] != addonapiv1alpha1.AddonLifecycleAddonManagerAnnotationValue {
 				return fmt.Errorf("addon should have annotation, but get %v", cma.Annotations)
 			}
 
@@ -441,6 +441,7 @@ func prepareAddOnDeploymentConfig(namespace string) error {
 						NodeSelector: nodeSelector,
 						Tolerations:  tolerations,
 					},
+					AgentInstallNamespace: metav1.NamespaceDefault,
 				},
 			},
 			metav1.CreateOptions{},
@@ -491,7 +492,8 @@ func prepareProxyConfigAddOnDeploymentConfig(namespace string) error {
 					Namespace: namespace,
 				},
 				Spec: addonapiv1alpha1.AddOnDeploymentConfigSpec{
-					ProxyConfig: proxyConfig,
+					ProxyConfig:           proxyConfig,
+					AgentInstallNamespace: metav1.NamespaceDefault,
 				},
 			},
 			metav1.CreateOptions{},