diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-20 10:27:59 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-20 10:27:59 +0000 |
| commit | 0c1cd36afbc27c577f0d04771827518e84a6739d (patch) | |
| tree | 7405857d5ce9d28e16698e221c228e0085b92aef | |
| parent | 801309308e677e724c772fddb1b99b0012453395 (diff) | |
| parent | cd68c560c2a3ed281dd0a8c1f84a81a77dc7056e (diff) | |
| download | gitlab-ce-0c1cd36afbc27c577f0d04771827518e84a6739d.tar.gz | |
Merge branch 'kinolaev-master-patch-13154' into 'master'
Auto-DevOps: allow to disable rollout status check
See merge request gitlab-org/gitlab-ce!28130
| -rw-r--r-- | changelogs/unreleased/kinolaev-master-patch-13154.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/changelogs/unreleased/kinolaev-master-patch-13154.yml b/changelogs/unreleased/kinolaev-master-patch-13154.yml new file mode 100644 index 00000000000..3292ff797e2 --- /dev/null +++ b/changelogs/unreleased/kinolaev-master-patch-13154.yml @@ -0,0 +1,5 @@ +--- +title: 'Auto-DevOps: allow to disable rollout status check' +merge_request: 28130 +author: Sergej Nikolaev <kinolaev@gmail.com> +type: fixed diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 42c8da1f6f1..5a8744d71f9 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -771,6 +771,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac | `K8S_SECRET_*` | From GitLab 11.7, any variable prefixed with [`K8S_SECRET_`](#application-secret-variables) will be made available by Auto DevOps as environment variables to the deployed application. | | `KUBE_INGRESS_BASE_DOMAIN` | From GitLab 11.8, this variable can be used to set a domain per cluster. See [cluster domains](../../user/project/clusters/index.md#base-domain) for more information. | | `ROLLOUT_RESOURCE_TYPE` | From GitLab 11.9, this variable allows specification of the resource type being deployed when using a custom helm chart. Default value is `deployment`. | +| `ROLLOUT_STATUS_DISABLED` | From GitLab 12.0, this variable allows to disable rollout status check because it doesn't support all resource types, for example, `cronjob`. | | `HELM_UPGRADE_EXTRA_ARGS` | From GitLab 11.11, this variable allows extra arguments in `helm` commands when deploying the application. Note that using quotes will not prevent word splitting. | TIP: **Tip:** diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 876f53c66ba..5f7af2ffc20 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -439,7 +439,9 @@ rollout 100%: chart/ fi - kubectl rollout status -n "$KUBE_NAMESPACE" -w "$ROLLOUT_RESOURCE_TYPE/$name" + if [[ -z "$ROLLOUT_STATUS_DISABLED" ]]; then + kubectl rollout status -n "$KUBE_NAMESPACE" -w "$ROLLOUT_RESOURCE_TYPE/$name" + fi } function scale() { |