remove webConsolePlugin from ToolchainClusterConfig (e2e tests) (code…

…ready-toolchain#1024) phase 1: only remove the CRD in host-operator standalone PR to remove webconsole-related e2e tests and makefile bits Signed-off-by: Xavier Coulon <[email protected]>
xcoulon · Jul 31, 2024 · 9e4e9c2 · 9e4e9c2
1 parent 0823fa9
commit 9e4e9c2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 239 deletions.
diff --git a/deploy/host-operator/e2e-tests/toolchainconfig.yaml b/deploy/host-operator/e2e-tests/toolchainconfig.yaml
@@ -46,6 +46,4 @@ spec:
         secret:
           ref: 'member-operator-secret'
           virtualMachineAccessKey: 'vm.access'
-      webConsolePlugin:
-        deploy: true
       environment: 'e2e-tests'
diff --git a/make/test.mk b/make/test.mk
@@ -386,7 +386,7 @@ create-host-resources: create-spaceprovisionerconfigs-for-members
 		echo "TOOLCHAIN_CLUSTER_NAME $${TOOLCHAIN_CLUSTER_NAME}"; \
 		echo "ENVIRONMENT ${ENVIRONMENT}"; \
 		PATCH_FILE=/tmp/patch-toolchainconfig_${DATE_SUFFIX}.json; \
-		echo "{\"spec\":{\"members\":{\"specificPerMemberCluster\":{\"$${TOOLCHAIN_CLUSTER_NAME}\":{\"webhook\":{\"deploy\":false},\"webConsolePlugin\":{\"deploy\":true},\"environment\":\"${ENVIRONMENT}\"}}}}}" > $$PATCH_FILE; \
+		echo "{\"spec\":{\"members\":{\"specificPerMemberCluster\":{\"$${TOOLCHAIN_CLUSTER_NAME}\":{\"webhook\":{\"deploy\":false},\"environment\":\"${ENVIRONMENT}\"}}}}}" > $$PATCH_FILE; \
 		oc patch toolchainconfig config -n ${HOST_NS} --type=merge --patch "$$(cat $$PATCH_FILE)"; \
 	fi;
 	echo "Restart host operator pods so that configuration referenced in main.go can get the updated ToolchainConfig CRs at startup"

diff --git a/test/e2e/parallel/e2e_test.go b/test/e2e/parallel/e2e_test.go
@@ -56,7 +56,7 @@ func TestE2EFlow(t *testing.T) {
 			VerifyMemberOperatorConfig(t, hostAwait, memberAwait, wait.UntilMemberConfigMatches(expectedMemberConfiguration))
 		})
 		t.Run("verify MemberOperatorConfig was synced to member 2", func(t *testing.T) {
-			member2ExpectedConfig := testconfig.NewMemberOperatorConfigObj(testconfig.Webhook().Deploy(false), testconfig.WebConsolePlugin().Deploy(true), testconfig.MemberEnvironment("e2e-tests"))
+			member2ExpectedConfig := testconfig.NewMemberOperatorConfigObj(testconfig.Webhook().Deploy(false), testconfig.MemberEnvironment("e2e-tests"))
 			VerifyMemberOperatorConfig(t, hostAwait, memberAwait2, wait.UntilMemberConfigMatches(member2ExpectedConfig.Spec))
 		})
 	})

diff --git a/test/e2e/parallel/web_console_plugin_test.go b/test/e2e/parallel/web_console_plugin_test.go