Skip to content

Commit 7304a97

Browse files
committed
Attempt migration to addon being managed by addon-manager
Allegedly outlined in open-cluster-management-io/ocm#355 Signed-off-by: Mike Spreitzer <mspreitz@us.ibm.com>
1 parent 6fea91f commit 7304a97

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

chart/templates/operator.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,14 @@ spec:
280280
metadata:
281281
name: addon-status
282282
namespace: open-cluster-management
283+
annotations:
284+
addon.open-cluster-management.io/lifecycle: addon-manager
283285
spec:
284286
addOnMeta:
285287
description: status addon provides full status on applied resources
286288
displayName: addon-status
289+
installStrategy:
290+
type: Manual
287291
supportedConfigs:
288292
- group: addon.open-cluster-management.io
289293
resource: addondeploymentconfigs

cmd/ocm-status-addon/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919

2020
"open-cluster-management.io/addon-framework/pkg/addonfactory"
2121
"open-cluster-management.io/addon-framework/pkg/addonmanager"
22-
addonagent "open-cluster-management.io/addon-framework/pkg/agent"
2322
cmdfactory "open-cluster-management.io/addon-framework/pkg/cmd/factory"
2423
"open-cluster-management.io/addon-framework/pkg/utils"
2524
"open-cluster-management.io/addon-framework/pkg/version"
@@ -169,7 +168,7 @@ func (ac *agentController) runController(ctx context.Context, kubeConfig *rest.C
169168
),
170169
).
171170
WithAgentRegistrationOption(registrationOption).
172-
WithInstallStrategy(addonagent.InstallAllStrategy(controller.InstallationNamespace)).
171+
// WithInstallStrategy(addonagent.InstallAllStrategy(controller.InstallationNamespace)).
173172
WithAgentHealthProber(controller.AgentHealthProber()).
174173
BuildTemplateAgentAddon()
175174
if err != nil {

config/manager/manager.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,14 @@ spec:
5050
metadata:
5151
name: addon-status
5252
namespace: open-cluster-management
53+
annotations:
54+
addon.open-cluster-management.io/lifecycle: addon-manager
5355
spec:
5456
addOnMeta:
5557
description: status addon provides full status on applied resources
5658
displayName: addon-status
59+
installStrategy:
60+
type: Manual
5761
supportedConfigs:
5862
- group: addon.open-cluster-management.io
5963
resource: addondeploymentconfigs

0 commit comments

Comments
 (0)