summaryrefslogtreecommitdiff
path: root/app/models/clusters
diff options
context:
space:
mode:
authorAmit Rathi <amit@hypertrack.io>2018-11-23 01:22:52 +0530
committerAmit Rathi <amit@hypertrack.io>2018-11-23 01:22:52 +0530
commit16248dc895b0abd2e5304e9092e0291a8b891ced (patch)
treeabe360799dac4be728154aa36995ea1f19e7898c /app/models/clusters
parentb82c98901d346c92e4c82a5eeff09bb84572b678 (diff)
downloadgitlab-ce-16248dc895b0abd2e5304e9092e0291a8b891ced.tar.gz
Addressing review comments
Diffstat (limited to 'app/models/clusters')
-rw-r--r--app/models/clusters/applications/cert_manager.rb14
1 files changed, 8 insertions, 6 deletions
diff --git a/app/models/clusters/applications/cert_manager.rb b/app/models/clusters/applications/cert_manager.rb
index ec0fab8ad99..922f4a880f0 100644
--- a/app/models/clusters/applications/cert_manager.rb
+++ b/app/models/clusters/applications/cert_manager.rb
@@ -39,18 +39,20 @@ module Clusters
def cluster_issuer_file
{
- 'cluster_issuer.yaml': cluster_issuer_yaml_content
+ 'cluster_issuer.yaml': cluster_issuer_content.deep_merge(cluster_issue_overlay)
}
end
- def cluster_issuer_yaml_content
- data = YAML.load_file(cluster_issuer_file_path)
- data["spec"]["acme"]["email"] = self.email
- YAML.dump(data)
+ def cluster_issuer_content
+ YAML.load_file(cluster_issuer_file_path)
+ end
+
+ def cluster_issue_overlay
+ { "spec" => { "acme" => { "email" => self.email } } }
end
def cluster_issuer_file_path
- "#{Rails.root}/vendor/cert_manager/cluster_issuer.yaml"
+ Rails.root.join('vendor', 'cert_manager', 'cluster_issuer.yaml')
end
end
end