summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/templates
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-04-02 07:21:26 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-04-02 07:21:26 +0000
commit1b6fe3ae226e4c6f481c90c886e242fcd96ab11b (patch)
tree1e96a1b916b1fb613e3b50bc52a8d11a5459fa06 /lib/gitlab/ci/templates
parent4d1116efa12509c07e685b7037bf5f317605c2a0 (diff)
parent3bc946ade3f5e35d50d91de71041da5c1c83d6ea (diff)
downloadgitlab-ce-1b6fe3ae226e4c6f481c90c886e242fcd96ab11b.tar.gz
Merge branch 'kube_helm_auto_devops_213' into 'master'
Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!26534
Diffstat (limited to 'lib/gitlab/ci/templates')
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 3116f1a136b..d4c70d4b9da 100644
--- 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