summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-08-13 21:57:14 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-08-13 21:57:14 +0000
commit383a18403f049652807df0be3be7a4a9cfc2aa95 (patch)
treef87d2275795c9997ffbab57ce87bd919014202c7 /lib
parente2361565ceb1754bd63c2d98a5c1cfe134e93160 (diff)
parentb577825e5485f1659d5b054fb59430fb4190f75a (diff)
downloadgitlab-ce-383a18403f049652807df0be3be7a4a9cfc2aa95.tar.gz
Merge branch 'bump_helm_kubectl_gitlab' into 'master'
Bump Helm to 2.14.3 and kubectl to 1.11.10 See merge request gitlab-org/gitlab-ce!31716
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/kubernetes/helm.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index 42c4745ff98..6e4286589c1 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.12.3'.freeze
- KUBECTL_VERSION = '1.11.7'.freeze
+ HELM_VERSION = '2.14.3'.freeze
+ KUBECTL_VERSION = '1.11.10'.freeze
NAMESPACE = 'gitlab-managed-apps'.freeze
SERVICE_ACCOUNT = 'tiller'.freeze
CLUSTER_ROLE_BINDING = 'tiller-admin'.freeze