diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 3 | ||||
-rw-r--r-- | app/models/clusters/applications/cert_manager.rb | 17 |
2 files changed, 15 insertions, 5 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 926fdc75a52..eb200113f4f 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -81,9 +81,6 @@ export default { ingressInstalled() { return this.applications.ingress.status === APPLICATION_STATUS.INSTALLED; }, - certManagerInstalled() { - return this.applications.cert_manager.status === APPLICATION_STATUS.INSTALLED; - }, ingressExternalIp() { return this.applications.ingress.externalIp; }, diff --git a/app/models/clusters/applications/cert_manager.rb b/app/models/clusters/applications/cert_manager.rb index c211a13db94..e2cc39ca5c5 100644 --- a/app/models/clusters/applications/cert_manager.rb +++ b/app/models/clusters/applications/cert_manager.rb @@ -33,10 +33,17 @@ module Clusters rbac: cluster.platform_kubernetes_rbac?, chart: chart, files: files.merge!(cluster_issuer_file), - postinstall: post_install_script + postinstall: post_install_script, + application_flags: install_command_flags ) end + def install_command_flags + ['--set', 'ingressShim.defaultIssuerName=letsencrypt-prod'] + + ['--set', 'ingressShim.defaultIssuerKind=ClusterIssuer'] + + ['--set', 'rbac.create=false'] + end + private def post_install_script @@ -45,10 +52,16 @@ module Clusters def cluster_issuer_file { - 'cluster_issuer.yaml': File.read(cluster_issuer_file_path) + 'cluster_issuer.yaml': cluster_issuer_yaml_content } end + def cluster_issuer_yaml_content + data = YAML.load_file(cluster_issuer_file_path) + data["spec"]["acme"]["email"] = self.email + YAML.dump(data) + end + def cluster_issuer_file_path "#{Rails.root}/vendor/cert_manager/cluster_issuer.yaml" end |