diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2019-05-17 11:06:48 +0300 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2019-05-17 11:06:48 +0300 |
commit | 17d8e5502eff2e1e8344f3267d9923975a25dd59 (patch) | |
tree | 1cd1fd368ebc22246b95895876ed6e10b8119595 /app | |
parent | f38265daa57d241bd9282279d11fcebd71bc6ea2 (diff) | |
parent | e27c288f8a50c1379cbfa22448e8ec4ca66d04ce (diff) |
Merge branch '60550-make-application-data-plain-module' into 'master'
Make ApplicationData a plain module include
Closes #60550
See merge request gitlab-org/gitlab-ce!28387
Diffstat (limited to 'app')
-rw-r--r-- | app/models/clusters/concerns/application_data.rb | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/app/models/clusters/concerns/application_data.rb b/app/models/clusters/concerns/application_data.rb index a48ee340fac..3479fea415e 100644 --- a/app/models/clusters/concerns/application_data.rb +++ b/app/models/clusters/concerns/application_data.rb @@ -3,56 +3,52 @@ module Clusters module Concerns module ApplicationData - extend ActiveSupport::Concern - - included do - def uninstall_command - Gitlab::Kubernetes::Helm::DeleteCommand.new( - name: name, - rbac: cluster.platform_kubernetes_rbac?, - files: files - ) - end + def uninstall_command + Gitlab::Kubernetes::Helm::DeleteCommand.new( + name: name, + rbac: cluster.platform_kubernetes_rbac?, + files: files + ) + end - def repository - nil - end + def repository + nil + end - def values - File.read(chart_values_file) - end + def values + File.read(chart_values_file) + end - def files - @files ||= begin - files = { 'values.yaml': values } + def files + @files ||= begin + 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 - end + files end + end - private + private - def certificate_files - { - 'ca.pem': ca_cert, - 'cert.pem': helm_cert.cert_string, - 'key.pem': helm_cert.key_string - } - end + 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 ca_cert + cluster.application_helm.ca_cert + end - def helm_cert - @helm_cert ||= cluster.application_helm.issue_client_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 + def chart_values_file + "#{Rails.root}/vendor/#{name}/values.yaml" end end end |