summaryrefslogtreecommitdiff
path: root/app/models/clusters/concerns
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2018-07-31 13:15:18 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-07-31 13:15:18 +0000
commitb21730116ea14fc1ac153478ed058e505bceed17 (patch)
treeb3c6c481f1a3368ad13cb2b1471b94a4b1034965 /app/models/clusters/concerns
parent5a3948a5733d7d4dc09bfa2daeaad5cc15ba2a00 (diff)
downloadgitlab-ce-b21730116ea14fc1ac153478ed058e505bceed17.tar.gz
Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"
This reverts merge request !20801
Diffstat (limited to 'app/models/clusters/concerns')
-rw-r--r--app/models/clusters/concerns/application_data.rb26
1 files changed, 0 insertions, 26 deletions
diff --git a/app/models/clusters/concerns/application_data.rb b/app/models/clusters/concerns/application_data.rb
index d66f09d48b5..96ac757e99e 100644
--- a/app/models/clusters/concerns/application_data.rb
+++ b/app/models/clusters/concerns/application_data.rb
@@ -12,34 +12,8 @@ module Clusters
File.read(chart_values_file)
end
- def files
- @files ||= begin
- files = { 'values.yaml': values }
-
- files.merge!(certificate_files) if cluster.application_helm.has_ssl?
-
- files
- end
- end
-
private
- def certificate_files
- {
- 'ca.pem': ca_cert,
- 'cert.pem': helm_cert.cert_string,
- 'key.pem': helm_cert.key_string
- }
- end
-
- def ca_cert
- cluster.application_helm.ca_cert
- end
-
- def helm_cert
- @helm_cert ||= cluster.application_helm.issue_client_cert
- end
-
def chart_values_file
"#{Rails.root}/vendor/#{name}/values.yaml"
end