Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Rathi <amit@hypertrack.io>2018-11-15 22:39:02 +0300
committerAmit Rathi <amit@hypertrack.io>2018-11-15 22:39:02 +0300
commitf0bdf34f72e9b79b4fda7a2fbc00a235b43c730d (patch)
tree5cbc128644ea833ef7b8b09ef1ff25409a417a9b
parentadfaafe7b07a14ba502b483233c316c85aacecde (diff)
Move ingress shim config from --set to values.yaml
-rw-r--r--app/models/clusters/applications/cert_manager.rb8
-rw-r--r--vendor/cert_manager/values.yaml5
2 files changed, 6 insertions, 7 deletions
diff --git a/app/models/clusters/applications/cert_manager.rb b/app/models/clusters/applications/cert_manager.rb
index 5ca17c7b6f6..4159cbd31de 100644
--- a/app/models/clusters/applications/cert_manager.rb
+++ b/app/models/clusters/applications/cert_manager.rb
@@ -33,16 +33,10 @@ module Clusters
rbac: cluster.platform_kubernetes_rbac?,
chart: chart,
files: files.merge!(cluster_issuer_file),
- postinstall: post_install_script,
- application_flags: install_command_flags
+ postinstall: post_install_script
)
end
- def install_command_flags
- ['--set', 'ingressShim.defaultIssuerName=letsencrypt-prod'] +
- ['--set', 'ingressShim.defaultIssuerKind=ClusterIssuer']
- end
-
private
def post_install_script
diff --git a/vendor/cert_manager/values.yaml b/vendor/cert_manager/values.yaml
index e69de29bb2d..4515e3e39c7 100644
--- a/vendor/cert_manager/values.yaml
+++ b/vendor/cert_manager/values.yaml
@@ -0,0 +1,5 @@
+# These options provide fully automated TLS.
+# See https://github.com/jetstack/cert-manager/blob/master/docs/reference/ingress-shim.rst#configuration
+ingressShim:
+ defaultIssuerKind: "ClusterIssuer"
+ defaultIssuerName: "letsencrypt-prod"