summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-09-03 07:20:16 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-09-03 07:20:16 +0000
commitf7f1c394fc15101c5467f0fd526c831c832e14f3 (patch)
treebffd98038492314ad8bdcc137a8d2855a20fd60b
parentdad32f9ce6ec75469bf7eab53835dfe8f5da1236 (diff)
parent86316478fe4f394aa5e32416a6161b690207be30 (diff)
downloadgitlab-ce-f7f1c394fc15101c5467f0fd526c831c832e14f3.tar.gz
Merge branch '50853-vendor-auto-devops-gitlab-ci-yml-to-resolve-redeploying-deleted-app-gives-helm-error' into 'master'
Vendor Auto-DevOps.gitlab-ci.yml to resolve "Redeploying deleted app gives helm error" Closes #50853 See merge request gitlab-org/gitlab-ce!21429
-rw-r--r--changelogs/unreleased/50853-vendor-auto-devops-gitlab-ci-yml-to-resolve-redeploying-deleted-app-gives-helm-error.yml5
-rw-r--r--vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/50853-vendor-auto-devops-gitlab-ci-yml-to-resolve-redeploying-deleted-app-gives-helm-error.yml b/changelogs/unreleased/50853-vendor-auto-devops-gitlab-ci-yml-to-resolve-redeploying-deleted-app-gives-helm-error.yml
new file mode 100644
index 00000000000..37922eb82f6
--- /dev/null
+++ b/changelogs/unreleased/50853-vendor-auto-devops-gitlab-ci-yml-to-resolve-redeploying-deleted-app-gives-helm-error.yml
@@ -0,0 +1,5 @@
+---
+title: 'Auto-DevOps.gitlab-ci.yml: fix redeploying deleted app gives helm error'
+merge_request: 21429
+author:
+type: fixed
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index ffcf5648075..893ab9efa2a 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -825,7 +825,7 @@ rollout 100%:
fi
if [[ -n "$(helm ls -q "^$name$")" ]]; then
- helm delete "$name"
+ helm delete --purge "$name"
fi
}