Automatic merge of gitlab-org/gitlab-ce master

ff091990 · GitLab Bot · fa8225b5 · f2b6c6ca · ff091990 · ff091990
Commit ff091990 authored Jul 26, 2019 by GitLab Bot
3 changed files
--- a/changelogs/unreleased/extract_auto_deploy_into_base_image.yml
+++ b/changelogs/unreleased/extract_auto_deploy_into_base_image.yml
+---
+title: Extract Auto DevOps deploy functions into a base image
+merge_request: 30404
+author:
+type: changed
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -50,9 +50,6 @@ variables:
  POSTGRES_DB: $CI_ENVIRONMENT_SLUG
  POSTGRES_VERSION: 9.6.2

-  KUBERNETES_VERSION: 1.11.10
-  HELM_VERSION: 2.14.0
-
  DOCKER_DRIVER: overlay2

  ROLLOUT_RESOURCE_TYPE: deployment

--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml