summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-11-05 09:49:04 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-11-05 09:49:04 +0000
commite083e28eac832bd2b2bde0545f626f44af947298 (patch)
treea36dc88621c11b3a398b4a4b1860d4e48c4ae087 /lib/gitlab
parent9e2eb85e365e2a33e52e3f1f48cc23ad4201a52b (diff)
parent9f206e17f10899884b6a0075d4f0a7aaad89519f (diff)
downloadgitlab-ce-e083e28eac832bd2b2bde0545f626f44af947298.tar.gz
Merge branch '53450-wrong-value-for-kubernetes_version-variable' into 'master'
Bump KUBERNETES_VERSION to latest 1.10 series Closes #53450 See merge request gitlab-org/gitlab-ce!22757
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 5a8cd92b75f..c759bb7098e 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -49,7 +49,7 @@ variables:
POSTGRES_ENABLED: "true"
POSTGRES_DB: $CI_ENVIRONMENT_SLUG
- KUBERNETES_VERSION: 1.8.6
+ KUBERNETES_VERSION: 1.10.9
HELM_VERSION: 2.11.0
DOCKER_DRIVER: overlay2