diff options
author | Amit Rathi <amit@hypertrack.io> | 2018-11-15 17:52:41 +0530 |
---|---|---|
committer | Amit Rathi <amit@hypertrack.io> | 2018-11-15 17:52:41 +0530 |
commit | 161e66890c734ec9a77fc25021572194a3ff246b (patch) | |
tree | 0558e7c9ebf655f31df09e5346ab70896c00a7af /lib/gitlab/kubernetes | |
parent | 5c275490ec8728deec3b6747c742e985656befc8 (diff) | |
download | gitlab-ce-161e66890c734ec9a77fc25021572194a3ff246b.tar.gz |
Set appropriate RBAC flag for cluster applications
Diffstat (limited to 'lib/gitlab/kubernetes')
-rw-r--r-- | lib/gitlab/kubernetes/helm/install_command.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/gitlab/kubernetes/helm/install_command.rb b/lib/gitlab/kubernetes/helm/install_command.rb index e77f8bc7ab8..c23576cacde 100644 --- a/lib/gitlab/kubernetes/helm/install_command.rb +++ b/lib/gitlab/kubernetes/helm/install_command.rb @@ -69,18 +69,18 @@ module Gitlab name_flag + optional_tls_flags + optional_version_flag + - optional_rbac_create_flag + + rbac_create_flag + namespace_flag + value_flag + application_flags end - def optional_rbac_create_flag - return [] unless rbac? - - # jupyterhub helm chart is using rbac.enabled - # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/tree/master/jupyterhub - %w[--set rbac.create=true,rbac.enabled=true] + def rbac_create_flag + if rbac? + %w[--set rbac.create=true,rbac.enabled=true] + else + %w[--set rbac.create=false,rbac.enabled=false] + end end def optional_version_flag |