🌱 remove duplicate controller and installstrategy (#252)

* remove duplicate controller and installstrategy Signed-off-by: haoqing0110 <qhao@redhat.com> * addon ownerref to pass integration tests Signed-off-by: haoqing0110 <qhao@redhat.com> * modify helloworld addon Signed-off-by: haoqing0110 <qhao@redhat.com> * remove self from annotation Signed-off-by: haoqing0110 <qhao@redhat.com> --------- Signed-off-by: haoqing0110 <qhao@redhat.com>
open-cluster-management-io · Mar 27, 2024 · b0ef02a · b0ef02a
1 parent 52eef42
commit b0ef02a
Show file tree

Hide file tree

Showing 35 changed files with 119 additions and 4,920 deletions.
diff --git a/examples/deploy/addon/helloworld-template/resources/cluster_management_addon.yaml b/examples/deploy/addon/helloworld-template/resources/cluster_management_addon.yaml
@@ -2,8 +2,6 @@ apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
   name: hello-template
-  annotations:
-    addon.open-cluster-management.io/lifecycle: "addon-manager"
 spec:
   addOnMeta:
     description: hello-template

diff --git a/examples/deploy/addon/helloworld/resources/helloworld_clustermanagementaddon.yaml b/examples/deploy/addon/helloworld/resources/helloworld_clustermanagementaddon.yaml
@@ -2,8 +2,6 @@ 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

diff --git a/examples/deploy/addon/kubernetes-dashboard/resources/cluster_management_addon.yaml b/examples/deploy/addon/kubernetes-dashboard/resources/cluster_management_addon.yaml
@@ -2,8 +2,6 @@ apiVersion: addon.open-cluster-management.io/v1alpha1
 kind: ClusterManagementAddOn
 metadata:
   name: kubernetes-dashboard
-  annotations:
-    addon.open-cluster-management.io/lifecycle: "addon-manager"
 spec:
   addOnMeta:
     description: kubernetes-dashboard

diff --git a/pkg/addonfactory/addonfactory.go b/pkg/addonfactory/addonfactory.go
@@ -57,7 +57,6 @@ func NewAgentAddonFactory(addonName string, fs embed.FS, dir string) *AgentAddon
 		agentAddonOptions: agent.AgentAddonOptions{
 			AddonName:           addonName,
 			Registration:        nil,
-			InstallStrategy:     nil,
 			HealthProber:        nil,
 			SupportedConfigGVRs: []schema.GroupVersionResource{},
 		},
@@ -83,19 +82,6 @@ func (f *AgentAddonFactory) WithGetValuesFuncs(getValuesFuncs ...GetValuesFunc)
 	return f
 }
 
-// WithInstallStrategy defines the installation strategy of the manifests prescribed by Manifests(..).
-// Deprecated: add annotation "addon.open-cluster-management.io/lifecycle: addon-manager" to ClusterManagementAddon
-// and define install strategy in ClusterManagementAddon spec.installStrategy instead.
-// The migration plan refer to https://github.com/open-cluster-management-io/ocm/issues/355.
-func (f *AgentAddonFactory) WithInstallStrategy(strategy *agent.InstallStrategy) *AgentAddonFactory {
-	if strategy.InstallNamespace == "" {
-		strategy.InstallNamespace = AddonDefaultInstallNamespace
-	}
-	f.agentAddonOptions.InstallStrategy = strategy
-
-	return f
-}
-
 // WithAgentRegistrationOption defines how agent is registered to the hub cluster.
 func (f *AgentAddonFactory) WithAgentRegistrationOption(option *agent.RegistrationOption) *AgentAddonFactory {
 	f.agentAddonOptions.Registration = option

diff --git a/pkg/addonmanager/controllers/addoninstall/controller.go b/pkg/addonmanager/controllers/addoninstall/controller.go