From 2f07063fe40e800491fed5eda218364fd1509bde Mon Sep 17 00:00:00 2001 From: Sergej Date: Tue, 19 Feb 2019 10:36:45 +0000 Subject: Fix rollout status for statefulsets and daemonsets --- changelogs/unreleased/kinolaev-master-patch-87865.yml | 5 +++++ lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/kinolaev-master-patch-87865.yml diff --git a/changelogs/unreleased/kinolaev-master-patch-87865.yml b/changelogs/unreleased/kinolaev-master-patch-87865.yml new file mode 100644 index 00000000000..b4dbc2c0e1f --- /dev/null +++ b/changelogs/unreleased/kinolaev-master-patch-87865.yml @@ -0,0 +1,5 @@ +--- +title: Fix rollout status for statefulsets and daemonsets +merge_request: 24972 +author: Sergej Nikolaev +type: fixed diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index e369d26f22f..527a432d72d 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -54,6 +54,8 @@ variables: DOCKER_DRIVER: overlay2 + ROLLOUT_RESOURCE_TYPE: deployment + stages: - build - test @@ -740,7 +742,7 @@ rollout 100%: chart/ fi - kubectl rollout status -n "$KUBE_NAMESPACE" -w "deployment/$name" + kubectl rollout status -n "$KUBE_NAMESPACE" -w "$ROLLOUT_RESOURCE_TYPE/$name" } function scale() { -- cgit v1.2.1