diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-28 21:17:46 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-28 21:17:46 +0000 |
| commit | d7e106b7b98563394f548cf1da6b59e1644fd5b8 (patch) | |
| tree | 6bcde0fb1559db36c1785404078377f991288b55 | |
| parent | 582500e39442076d0e718adf5c7c7dc17d91bd4a (diff) | |
| parent | d1a7368e8e232fe996e86938548cf720eee3e138 (diff) | |
| download | gitlab-ce-d7e106b7b98563394f548cf1da6b59e1644fd5b8.tar.gz | |
Merge branch 'auto-devops-kubernestes-bump1-11-10' into 'master'61146-style-tertiary-button-type-to-be-aligned-with-pattern-library
Bumps Kubernetes in Auto DevOps to 1.11.10
See merge request gitlab-org/gitlab-ce!28525
| -rw-r--r-- | changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.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-kubernestes-bump1-11-10.yml b/changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.yml new file mode 100644 index 00000000000..9ba55719bdf --- /dev/null +++ b/changelogs/unreleased/auto-devops-kubernestes-bump1-11-10.yml @@ -0,0 +1,5 @@ +--- +title: Bumps Kubernetes in Auto DevOps to 1.11.10 +merge_request: 28525 +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 939112e6e41..87cd62ef2d4 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -50,7 +50,7 @@ variables: POSTGRES_DB: $CI_ENVIRONMENT_SLUG POSTGRES_VERSION: 9.6.2 - KUBERNETES_VERSION: 1.11.9 + KUBERNETES_VERSION: 1.11.10 HELM_VERSION: 2.13.1 DOCKER_DRIVER: overlay2 |