Skip to content

Commit 9e60e2e

Browse files
Add e2e test for embedded-operator
Signed-off-by: Danil-Grigorev <[email protected]>
1 parent 7d17263 commit 9e60e2e

File tree

6 files changed

+14
-4
lines changed

6 files changed

+14
-4
lines changed

charts/rancher-turtles/templates/clusterctl-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@ kind: ConfigMap
44
metadata:
55
name: clusterctl-config
66
namespace: '{{ .Values.rancherTurtles.namespace }}'
7-
annotations:
8-
"helm.sh/hook": "pre-install, pre-upgrade"
9-
"helm.sh/hook-weight": "-1"
107
{{- end}}

charts/rancher-turtles/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
containers:
2727
- args:
2828
- --leader-elect
29-
- --feature-gates=agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}},ui-plugin={{ index .Values "turtlesUI" "enabled"}}
29+
- --feature-gates=agent-tls-mode={{ index .Values "rancherTurtles" "features" "agent-tls-mode" "enabled"}},ui-plugin={{ index .Values "turtlesUI" "enabled"}},embedded-operator={{ index .Values "rancherTurtles" "features" "embedded-operator" "enabled"}}
3030
{{- range .Values.rancherTurtles.managerArguments }}
3131
- {{ . }}
3232
{{- end }}

test/e2e/suites/chart-upgrade/chart_upgrade_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestL
5959

6060
testenv.DeployChartMuseum(ctx, chartMuseumDeployInput)
6161

62+
rtInput.AdditionalValues["cluster-api-operator.enabled"] = "false"
63+
rtInput.AdditionalValues["rancherTurtles.features.embedded-operator.enabled"] = "true"
64+
6265
upgradeInput := testenv.UpgradeRancherTurtlesInput{
6366
BootstrapClusterProxy: bootstrapClusterProxy,
6467
AdditionalValues: rtInput.AdditionalValues,

test/e2e/suites/etcd-snapshot-restore/suite_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ var _ = SynchronizedBeforeSuite(
8080
AdditionalValues: map[string]string{
8181
"rancherTurtles.features.day2operations.enabled": "true", // enable day2operations feature
8282
"rancherTurtles.features.day2operations.etcdBackupRestore.enabled": "true", // enable etcdBackupRestore feature
83+
"cluster-api-operator.enabled": "false",
84+
"rancherTurtles.features.embedded-operator.enabled": "true",
8385
},
8486
WaitForDeployments: testenv.DefaultDeployments,
8587
})

test/e2e/suites/import-gitops-v3/suite_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ var _ = SynchronizedBeforeSuite(
7777

7878
testenv.DeployRancherTurtles(ctx, testenv.DeployRancherTurtlesInput{
7979
BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy,
80+
AdditionalValues: map[string]string{
81+
"cluster-api-operator.enabled": "false",
82+
"rancherTurtles.features.embedded-operator.enabled": "true",
83+
},
8084
})
8185

8286
data, err := json.Marshal(e2e.Setup{

test/e2e/suites/v2prov/suite_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ var _ = SynchronizedBeforeSuite(
8484
BootstrapClusterProxy: setupClusterResult.BootstrapClusterProxy,
8585
CAPIProvidersYAML: e2e.CapiProviders,
8686
WaitForDeployments: testenv.DefaultDeployments,
87+
AdditionalValues: map[string]string{
88+
"cluster-api-operator.enabled": "false",
89+
"rancherTurtles.features.embedded-operator.enabled": "true",
90+
},
8791
})
8892

8993
testenv.RestartRancher(ctx, testenv.RestartRancherInput{

0 commit comments

Comments
 (0)