Automatic merge of gitlab-org/gitlab-ce master

82a03e80 · GitLab Bot · 13c26a9b · 1b6fe3ae · 82a03e80 · 82a03e80
Commit 82a03e80 authored Apr 02, 2019 by GitLab Bot
Showing with 7 additions and 2 deletions

changelogs/unreleased/kube_helm_auto_devops_213.yml changelogs/unreleased/kube_helm_auto_devops_213.yml +5 -0

lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +2 -2

No files found.
--- a/changelogs/unreleased/kube_helm_auto_devops_213.yml
+++ b/changelogs/unreleased/kube_helm_auto_devops_213.yml
+---
+title: Bump kubectl to 1.11.9 and Helm to 2.13.1 in Auto-DevOps.gitlab-ci.yml
+merge_request: 26534
+author:
+type: other
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -50,8 +50,8 @@ variables:
  POSTGRES_DB: $CI_ENVIRONMENT_SLUG
  POSTGRES_VERSION: 9.6.2

-  KUBERNETES_VERSION: 1.11.7
-  HELM_VERSION: 2.12.3
+  KUBERNETES_VERSION: 1.11.9
+  HELM_VERSION: 2.13.1

  DOCKER_DRIVER: overlay2