diff options
Diffstat (limited to 'app/models/clusters/concerns/application_data.rb')
| -rw-r--r-- | app/models/clusters/concerns/application_data.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/models/clusters/concerns/application_data.rb b/app/models/clusters/concerns/application_data.rb index 3479fea415e..77c606553d2 100644 --- a/app/models/clusters/concerns/application_data.rb +++ b/app/models/clusters/concerns/application_data.rb @@ -23,7 +23,7 @@ module Clusters @files ||= begin files = { 'values.yaml': values } - files.merge!(certificate_files) if cluster.application_helm.has_ssl? + files.merge!(certificate_files) if use_tiller_ssl? files end @@ -31,6 +31,12 @@ module Clusters private + def use_tiller_ssl? + return false if ::Gitlab::Kubernetes::Helm.local_tiller_enabled? + + cluster.application_helm.has_ssl? + end + def certificate_files { 'ca.pem': ca_cert, |