Adjust helm to support deletion protection flags

mongodb · Jul 12, 2023 · abe00cf · abe00cf
1 parent 1f1f6ad
commit abe00cf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/helm-charts b/helm-charts
diff --git a/test/e2e/cli/helm/helm.go b/test/e2e/cli/helm/helm.go
@@ -107,6 +107,8 @@ func InstallOperatorWideSubmodule(input model.UserInputs) {
 		"atlas-operator-"+input.Project.GetProjectName(),
 		config.AtlasOperatorHelmChartPath,
 		"--set-string", fmt.Sprintf("atlasURI=%s", config.AtlasHost),
+		"--set", "objectDeletionProtection=false",
+		"--set", "subobjectDeletionProtection=false",
 		"--set-string", fmt.Sprintf("image.repository=%s", repo),
 		"--set-string", fmt.Sprintf("image.tag=%s", tag),
 		"--namespace", input.Namespace,
@@ -122,6 +124,8 @@ func InstallOperatorNamespacedFromLatestRelease(input model.UserInputs) {
 		"mongodb/mongodb-atlas-operator",
 		"--set", fmt.Sprintf("watchNamespaces={%s}", input.Namespace),
 		"--set-string", fmt.Sprintf("atlasURI=%s", config.AtlasHost),
+		"--set", "objectDeletionProtection=false",
+		"--set", "subobjectDeletionProtection=false",
 		"--namespace="+input.Namespace,
 		"--create-namespace",
 	)
@@ -141,6 +145,8 @@ func InstallOperatorNamespacedSubmodule(input model.UserInputs) {
 		"--set-string", fmt.Sprintf("image.tag=%s", tag),
 		"--set", fmt.Sprintf("watchNamespaces={%s}", input.Namespace),
 		"--set", "mongodb-atlas-operator-crds.enabled=false",
+		"--set", "objectDeletionProtection=false",
+		"--set", "subobjectDeletionProtection=false",
 		"--namespace="+input.Namespace,
 		"--create-namespace",
 	)
@@ -188,6 +194,8 @@ func UpgradeOperatorChart(input model.UserInputs) {
 		"atlas-operator-"+input.Project.GetProjectName(),
 		config.AtlasOperatorHelmChartPath,
 		"--set-string", fmt.Sprintf("atlasURI=%s", config.AtlasHost),
+		"--set", "objectDeletionProtection=false",
+		"--set", "subobjectDeletionProtection=false",
 		"--set-string", fmt.Sprintf("image.repository=%s", repo),
 		"--set-string", fmt.Sprintf("image.tag=%s", tag),
 		"-n", input.Namespace,

diff --git a/test/e2e/helm_chart_test.go b/test/e2e/helm_chart_test.go
@@ -214,7 +214,7 @@ var _ = Describe("HELM charts", func() {
 		})
 	})
 
-	Describe("HELM charts.", Label("helm-update"), func() {
+	FDescribe("HELM charts.", Label("helm-update"), func() {
 		It("User deploy operator and later deploy new version of the Atlas operator", func() {
 			By("User creates configuration for a new Project, Deployment, DBUser", func() {
 				data = model.DataProviderWithResources(

diff --git a/test/int/project_protect_test.go b/test/int/project_protect_test.go
@@ -56,7 +56,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasProject", "protection-enable
 			})
 
 			// nolint:dupl
-			By("Deleting project in cluster don't delete from Atlas", func() {
+			By("Deleting project in cluster doesn't delete from Atlas", func() {
 				projectID := testProject.ID()
 				Expect(k8sClient.Delete(context.TODO(), testProject, &client.DeleteOptions{})).To(Succeed())
 
@@ -98,7 +98,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasProject", "protection-enable
 			})
 
 			// nolint:dupl
-			By("Deleting project in cluster don't delete from Atlas", func() {
+			By("Deleting project in cluster doesn't delete from Atlas", func() {
 				projectID := testProject.ID()
 				Expect(k8sClient.Delete(context.TODO(), testProject, &client.DeleteOptions{})).To(Succeed())