diff options
| author | Michael Kozono <mkozono@gmail.com> | 2019-04-05 20:22:50 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-04-05 20:22:50 +0000 |
| commit | 2210f5e8696693e1f36b6fa3f98c6bd0ca370fc0 (patch) | |
| tree | 16a5274872a1d27bf427b80545ec4397f46988af | |
| parent | d793d4a7c30c7e16e43b8f4d393c393fe9e7ab3f (diff) | |
| parent | 135b78bb258cbe1bee2a93ec30a51b9dbd73bb02 (diff) | |
| download | gitlab-ce-2210f5e8696693e1f36b6fa3f98c6bd0ca370fc0.tar.gz | |
Merge branch 'revert-a827092b' into 'master'
Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'"
See merge request gitlab-org/gitlab-ce!27062
| -rw-r--r-- | changelogs/unreleased/bump_kubernetes_1_11_9.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/kubernetes/helm.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/kubernetes/helm/pod_spec.rb | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/changelogs/unreleased/bump_kubernetes_1_11_9.yml b/changelogs/unreleased/bump_kubernetes_1_11_9.yml deleted file mode 100644 index 4bc7ff6d8e9..00000000000 --- a/changelogs/unreleased/bump_kubernetes_1_11_9.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump Helm and kubectl used in Kubernetes integration to 2.13.1 and 1.11.9 respectively -merge_request: 26991 -author: -type: other diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb index 24713223513..42c4745ff98 100644 --- a/lib/gitlab/kubernetes/helm.rb +++ b/lib/gitlab/kubernetes/helm.rb @@ -3,8 +3,8 @@ module Gitlab module Kubernetes module Helm - HELM_VERSION = '2.13.1'.freeze - KUBECTL_VERSION = '1.11.9'.freeze + HELM_VERSION = '2.12.3'.freeze + KUBECTL_VERSION = '1.11.7'.freeze NAMESPACE = 'gitlab-managed-apps'.freeze SERVICE_ACCOUNT = 'tiller'.freeze CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze diff --git a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb index 10876709f36..06c8d127951 100644 --- a/spec/lib/gitlab/kubernetes/helm/pod_spec.rb +++ b/spec/lib/gitlab/kubernetes/helm/pod_spec.rb @@ -30,7 +30,7 @@ describe Gitlab::Kubernetes::Helm::Pod do it 'generates the appropriate specifications for the container' do container = subject.generate.spec.containers.first expect(container.name).to eq('helm') - expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.13.1-kube-1.11.9') + expect(container.image).to eq('registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.12.3-kube-1.11.7') expect(container.env.count).to eq(3) expect(container.env.map(&:name)).to match_array([:HELM_VERSION, :TILLER_NAMESPACE, :COMMAND_SCRIPT]) expect(container.command).to match_array(["/bin/sh"]) |