diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-01-14 14:36:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-01-14 14:36:32 +0300 |
| commit | 715f3400ae5e3358f784f4c945db21b8a5dc5a82 (patch) | |
| tree | a92a9cbe7654faf53e7650883e8bf393c0ae4f0a | |
| parent | fb8e9509c872364f0f557bc316f37c14e1295aa7 (diff) | |
| parent | 66b829c7a0f7db1c9c3b1770586e28e8f0f718dc (diff) | |
Merge branch 'auto-devops-kubectl-1-11-6' into 'master'
Bump kubectl in Auto DevOps to 1.11.6
See merge request gitlab-org/gitlab-ce!24176
| -rw-r--r-- | changelogs/unreleased/auto-devops-kubectl-1-11-6.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/auto-devops-kubectl-1-11-6.yml b/changelogs/unreleased/auto-devops-kubectl-1-11-6.yml new file mode 100644 index 00000000000..1a8cdead4ac --- /dev/null +++ b/changelogs/unreleased/auto-devops-kubectl-1-11-6.yml @@ -0,0 +1,5 @@ +--- +title: Bump kubectl in Auto DevOps to 1.11.6 +merge_request: 24176 +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 e292641da2b..de4288fb532 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.10.9 + KUBERNETES_VERSION: 1.11.6 HELM_VERSION: 2.11.0 DOCKER_DRIVER: overlay2 |