Implement workaround for e2e tests

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>

Author: anmazzotti

tests/e2e/downgrade_test.go

@@ -58,7 +58,7 @@ var _ = Describe("Elemental Operator downgrade/upgrade test", func() {
 		})
 
 		By("Install the new Elemental Operator", func() {
-			deployOperator(k, &downgradeCfg)
+			deployOperator(k, &downgradeCfg, true)
 		})
 
 		By("Check it gets a default channel and syncs ManagedOSVersions", func() {
@@ -86,7 +86,7 @@ var _ = Describe("Elemental Operator downgrade/upgrade test", func() {
 		})
 
 		By("Upgrading Elemental Operator to testing version", func() {
-			deployOperator(k, e2eCfg)
+			deployOperator(k, e2eCfg, false)
 		})
 
 		By("Check we still keep the previous default channel managed by Helm", func() {

tests/e2e/e2e_suite_test.go

@@ -129,7 +129,7 @@ var _ = BeforeSuite(func() {
 			err = k.WaitForNamespaceDelete(operatorNamespace)
 			Expect(err).ToNot(HaveOccurred())
 
-			deployOperator(k, e2eCfg)
+			deployOperator(k, e2eCfg, false)
 
 			// Somehow rancher needs to be restarted after an elemental-operator upgrade
 			// to get machineregistration working
@@ -281,7 +281,7 @@ var _ = BeforeSuite(func() {
 
 	})
 
-	deployOperator(k, e2eCfg)
+	deployOperator(k, e2eCfg, false)
 })
 
 var _ = AfterSuite(func() {
@@ -299,11 +299,21 @@ func isOperatorInstalled(k *kubectl.Kubectl) bool {
 	return len(pods) > 0
 }
 
-func deployOperator(k *kubectl.Kubectl, config *e2eConfig.E2EConfig) {
+func deployOperator(k *kubectl.Kubectl, config *e2eConfig.E2EConfig, oldChartName bool) {
+	// This is a temporary workaround to cope with the chart name change.
+	// During the downgrade test we need to use the old name (with "-chart" suffix)
+	// See: https://github.com/rancher/elemental-operator/issues/826
+	chartName := operatorName
+	chartCRDsName := operatorCRDsName
+	if oldChartName {
+		chartName = fmt.Sprintf("%s-chart", chartName)
+		chartCRDsName = fmt.Sprintf("%s-chart", chartCRDsName)
+	}
+
 	By("Deploying elemental-operator chart", func() {
 		Expect(kubectl.RunHelmBinaryWithCustomErr(
 			"upgrade", "--install",
-			operatorCRDsName,
+			chartCRDsName,
 			config.CRDsChart,
 			"--set", "debug=true",
 			"--set", fmt.Sprintf("replicas=%s", config.OperatorReplicas),
@@ -329,7 +339,7 @@ func deployOperator(k *kubectl.Kubectl, config *e2eConfig.E2EConfig) {
 
 		Expect(kubectl.RunHelmBinaryWithCustomErr(
 			"upgrade", "--install",
-			operatorName,
+			chartName,
 			config.Chart,
 			"--set", "debug=true",
 			"--set", fmt.Sprintf("replicas=%s", config.OperatorReplicas),