summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-01 21:58:45 +0000
committerThong Kuah <tkuah@gitlab.com>2018-11-04 00:09:43 +1300
commit9f206e17f10899884b6a0075d4f0a7aaad89519f (patch)
tree5c54eac7b5ad131c7e69f4e48796af6faf20662c
parent3cdf7c7ec137d7753bab7687b24c7c1cd880357b (diff)
downloadgitlab-ce-9f206e17f10899884b6a0075d4f0a7aaad89519f.tar.gz
Bump KUBERNETES_VERSION to latest 1.10 series53450-wrong-value-for-kubernetes_version-variable
This allows us to use a kubectl binary that should be able to connect to Kubernetes clusters v1.9 and up.
-rw-r--r--changelogs/unreleased/53450-wrong-value-for-kubernetes_version-variable.yml5
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/53450-wrong-value-for-kubernetes_version-variable.yml b/changelogs/unreleased/53450-wrong-value-for-kubernetes_version-variable.yml
new file mode 100644
index 00000000000..cd9300ca2d1
--- /dev/null
+++ b/changelogs/unreleased/53450-wrong-value-for-kubernetes_version-variable.yml
@@ -0,0 +1,5 @@
+---
+title: Bump KUBERNETES_VERSION for Auto DevOps to latest 1.10 series
+merge_request: 22757
+author:
+type: other
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 734af5eba59..8f6989fd0c6 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