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

Fix rollout status for statefulsets and daemonsets

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

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

+---
+title: Fix rollout status for statefulsets and daemonsets
+merge_request: 24972
+author: Sergej Nikolaev <kinolaev@gmail.com>
+type: fixed

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() {