Commit 7ba9e413 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 09707c8d b6cf4ec1
---
title: Bump Helm and kubectl used in Kubernetes integration to 2.13.1 and 1.11.9 respectively
merge_request: 26991
author:
type: other
---
title: Upgrade to Gitaly v1.32.0
merge_request: 26989
author:
type: changed
......@@ -3,8 +3,8 @@
module Gitlab
module Kubernetes
module Helm
HELM_VERSION = '2.12.3'.freeze
KUBECTL_VERSION = '1.11.7'.freeze
HELM_VERSION = '2.13.1'.freeze
KUBECTL_VERSION = '1.11.9'.freeze
NAMESPACE = 'gitlab-managed-apps'.freeze
SERVICE_ACCOUNT = 'tiller'.freeze
CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze
......
......@@ -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.12.3-kube-1.11.7')
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.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"])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment