diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-05 12:49:04 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-05 12:49:04 +0300 |
| commit | e083e28eac832bd2b2bde0545f626f44af947298 (patch) | |
| tree | a36dc88621c11b3a398b4a4b1860d4e48c4ae087 | |
| parent | 9e2eb85e365e2a33e52e3f1f48cc23ad4201a52b (diff) | |
| parent | 9f206e17f10899884b6a0075d4f0a7aaad89519f (diff) | |
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
| -rw-r--r-- | changelogs/unreleased/53450-wrong-value-for-kubernetes_version-variable.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
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 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 |