Merge branch 'helm-2.12.3' into 'master'

Bump Helm and kubectl in Auto DevOps See merge request gitlab-org/gitlab-ce!25072

Merge branch 'helm-2.12.3' into 'master'
Bump Helm and kubectl in Auto DevOps See merge request gitlab-org/gitlab-ce!25072
dd28b621 · Dmitriy Zaporozhets · 590cc1d4 · 342707e9 · dd28b621 · dd28b621
Commit dd28b621 authored Feb 20, 2019 by Dmitriy Zaporozhets
Showing with 7 additions and 2 deletions

changelogs/unreleased/helm-2-12-3.yml changelogs/unreleased/helm-2-12-3.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/helm-2-12-3.yml
+++ b/changelogs/unreleased/helm-2-12-3.yml
+---
+title: Bump Helm and kubectl in Auto DevOps to 2.12.3 and 1.11.7 respectively
+merge_request: 25072
+author:
+type: other
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -49,8 +49,8 @@ variables:
  POSTGRES_ENABLED: "true"
  POSTGRES_DB: $CI_ENVIRONMENT_SLUG

-  KUBERNETES_VERSION: 1.11.6
-  HELM_VERSION: 2.12.2
+  KUBERNETES_VERSION: 1.11.7
+  HELM_VERSION: 2.12.3

  DOCKER_DRIVER: overlay2