From f00fb342412d998fc457662b00f3a8e60e25adce Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Tue, 21 May 2024 23:04:51 +0800 Subject: [PATCH] Update install strategy for cluster-proxy addon (#713) Signed-off-by: Jian Qiu --- .../templates/clustermanagementaddon.yaml | 11 +++++++++++ .../templates/manager-deployment.yaml | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml index 7f5096e4f..efccf5da4 100644 --- a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml +++ b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/clustermanagementaddon.yaml @@ -1,13 +1,24 @@ apiVersion: addon.open-cluster-management.io/v1alpha1 kind: ClusterManagementAddOn metadata: + annotations: + addon.open-cluster-management.io/lifecycle: addon-manager name: cluster-proxy spec: addOnMeta: displayName: cluster-proxy description: cluster-proxy + installStrategy: + placements: + - name: global + namespace: open-cluster-management-global-set + rolloutStrategy: + type: All + type: Placements supportedConfigs: - group: proxy.open-cluster-management.io resource: managedproxyconfigurations defaultConfig: name: cluster-proxy + - group: addon.open-cluster-management.io + resource: addondeploymentconfigs diff --git a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml index f2fea39bb..8ce0abdde 100644 --- a/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml +++ b/pkg/templates/charts/toggle/cluster-proxy-addon/templates/manager-deployment.yaml @@ -85,7 +85,6 @@ spec: - --signer-secret-namespace={{ .Values.global.namespace }} - --agent-image-name={{ .Values.global.imageOverrides.cluster_proxy }} - --agent-install-namespace=open-cluster-management-agent-addon - - --agent-install-all=true - --enable-kube-api-proxy=false securityContext: allowPrivilegeEscalation: false