Merge branch 'kinolaev-master-patch-13154' into 'master'

Auto-DevOps: allow to disable rollout status check

See merge request gitlab-org/gitlab-ce!28130

changelogs/unreleased/kinolaev-master-patch-13154.yml

+---
+title: 'Auto-DevOps: allow to disable rollout status check'
+merge_request: 28130
+author: Sergej Nikolaev <kinolaev@gmail.com>
+type: fixed

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:**

lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml

@@ -439,7 +439,9 @@ rollout 100%:
         chart/
     fi
 
+    if [[ -z "$ROLLOUT_STATUS_DISABLED" ]]; then
       kubectl rollout status -n "$KUBE_NAMESPACE" -w "$ROLLOUT_RESOURCE_TYPE/$name"
+    fi
   }
 
   function scale() {