Commit e27c288f authored by Dylan Griffith's avatar Dylan Griffith

Make ApplicationData a plain module include

parent 913bc964
...@@ -3,56 +3,52 @@ ...@@ -3,56 +3,52 @@
module Clusters module Clusters
module Concerns module Concerns
module ApplicationData module ApplicationData
extend ActiveSupport::Concern def uninstall_command
Gitlab::Kubernetes::Helm::DeleteCommand.new(
included do name: name,
def uninstall_command rbac: cluster.platform_kubernetes_rbac?,
Gitlab::Kubernetes::Helm::DeleteCommand.new( files: files
name: name, )
rbac: cluster.platform_kubernetes_rbac?, end
files: files
)
end
def repository def repository
nil nil
end end
def values def values
File.read(chart_values_file) File.read(chart_values_file)
end end
def files def files
@files ||= begin @files ||= begin
files = { 'values.yaml': values } files = { 'values.yaml': values }
files.merge!(certificate_files) if cluster.application_helm.has_ssl? files.merge!(certificate_files) if cluster.application_helm.has_ssl?
files files
end
end end
end
private private
def certificate_files def certificate_files
{ {
'ca.pem': ca_cert, 'ca.pem': ca_cert,
'cert.pem': helm_cert.cert_string, 'cert.pem': helm_cert.cert_string,
'key.pem': helm_cert.key_string 'key.pem': helm_cert.key_string
} }
end end
def ca_cert def ca_cert
cluster.application_helm.ca_cert cluster.application_helm.ca_cert
end end
def helm_cert def helm_cert
@helm_cert ||= cluster.application_helm.issue_client_cert @helm_cert ||= cluster.application_helm.issue_client_cert
end end
def chart_values_file def chart_values_file
"#{Rails.root}/vendor/#{name}/values.yaml" "#{Rails.root}/vendor/#{name}/values.yaml"
end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment