summaryrefslogtreecommitdiff
path: root/app/models/clusters/concerns/application_data.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/clusters/concerns/application_data.rb')
-rw-r--r--app/models/clusters/concerns/application_data.rb17
1 files changed, 2 insertions, 15 deletions
diff --git a/app/models/clusters/concerns/application_data.rb b/app/models/clusters/concerns/application_data.rb
index ade27e69642..22e597e9747 100644
--- a/app/models/clusters/concerns/application_data.rb
+++ b/app/models/clusters/concerns/application_data.rb
@@ -7,8 +7,7 @@ module Clusters
Gitlab::Kubernetes::Helm::DeleteCommand.new(
name: name,
rbac: cluster.platform_kubernetes_rbac?,
- files: files,
- local_tiller_enabled: cluster.local_tiller_enabled?
+ files: files
)
end
@@ -21,23 +20,11 @@ module Clusters
end
def files
- @files ||= begin
- files = { 'values.yaml': values }
-
- files.merge!(certificate_files) if use_tiller_ssl?
-
- files
- end
+ @files ||= { 'values.yaml': values }
end
private
- def use_tiller_ssl?
- return false if cluster.local_tiller_enabled?
-
- cluster.application_helm.has_ssl?
- end
-
def certificate_files
{
'ca.pem': ca_cert,