Automatic merge of gitlab-org/gitlab-ce master

GITALY_SERVER_VERSION

-1.31.0
+1.32.0

changelogs/unreleased/bump_kubernetes_1_11_9.yml

+---
+title: Bump Helm and kubectl used in Kubernetes integration to 2.13.1 and 1.11.9 respectively
+merge_request: 26991
+author:
+type: other

changelogs/unreleased/gitaly-version-v1.32.0.yml

+---
+title: Upgrade to Gitaly v1.32.0
+merge_request: 26989
+author:
+type: changed

lib/gitlab/kubernetes/helm.rb

@@ -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

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.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"])