提交: b6aba273eb4d46e4a66d77732c12c6f905f6ec79 - jenkins-x-boot-config (git)

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• 修訂: b6aba273eb4d46e4a66d77732c12c6f905f6ec79 (tree)
• 時間: 2019-08-28 18:42:55
• 作者: Cosmin Cojocar <cosmin.cojocar@gmx....>
• Commiter: Cosmin Cojocar

Log Message

fix: disable the optional charts installation

Disable the installation of the cert-manager, external-dns and acme charts when
they are disable in the jx-requirements.yml file.

Signed-off-by: Cosmin Cojocar <[e-mail]>

Change Summary

• modified: jenkins-x.yml
• modified: systems/acme/templates/cert-manager-prod-certificate.yaml
• modified: systems/acme/templates/cert-manager-prod-issuer.yaml
• modified: systems/acme/templates/cert-manager-staging-certificate.yaml
• modified: systems/acme/templates/cert-manager-staging-issuer.yaml
• modified: systems/acme/values.tmpl.yaml
• modified: systems/cm/requirements.yaml
• delete: systems/cm/{values.yaml => values.tmpl.yaml}

差異

--- a/jenkins-x.yml
+++ b/jenkins-x.yml
@@ -63,7 +63,7 @@ pipelineConfig:
                 dir: /workspace/source/env
                 command: jx
                 args: ['step', 'create', 'values', '--name', 'parameters']
-              - name: 
+              - name: install-env 
                 dir: /workspace/source/env
                 command: jx
                 args: ['step','helm','apply', '--boot', '--remote', '--name', 'jenkins-x', '--provider-values-dir', '../kubeProviders']

--- a/systems/acme/templates/cert-manager-prod-certificate.yaml
+++ b/systems/acme/templates/cert-manager-prod-certificate.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.certmanager.enabled }}
 {{- if eq .Values.certmanager.production "true" }}
 apiVersion: certmanager.k8s.io/v1alpha1
 kind: Certificate
@@ -10,4 +11,5 @@ spec:
   commonName: "*.{{ .Values.cluster.domain }}"
   dnsNames:
   - "*.{{ .Values.cluster.domain }}"
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}

--- a/systems/acme/templates/cert-manager-prod-issuer.yaml
+++ b/systems/acme/templates/cert-manager-prod-issuer.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.certmanager.enabled }}
 {{- if eq .Values.certmanager.production "true" }}
 apiVersion: certmanager.k8s.io/v1alpha1
 kind: Issuer
@@ -24,4 +25,5 @@ spec:
           serviceAccountSecretRef:
             name: external-dns-gcp-sa
             key: credentials.json
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}

--- a/systems/acme/templates/cert-manager-staging-certificate.yaml
+++ b/systems/acme/templates/cert-manager-staging-certificate.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.certmanager.enabled }}
 {{- if eq .Values.certmanager.production "false" }}
 apiVersion: certmanager.k8s.io/v1alpha1
 kind: Certificate
@@ -10,4 +11,5 @@ spec:
   commonName: "*.{{ .Values.cluster.domain }}"
   dnsNames:
   - "*.{{ .Values.cluster.domain }}"
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}

--- a/systems/acme/templates/cert-manager-staging-issuer.yaml
+++ b/systems/acme/templates/cert-manager-staging-issuer.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.certmanager.enabled }}
 {{- if eq .Values.certmanager.production "false" }}
 apiVersion: certmanager.k8s.io/v1alpha1
 kind: Issuer
@@ -24,4 +25,6 @@ spec:
           serviceAccountSecretRef:
             name: external-dns-gcp-sa
             key: credentials.json
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
+

--- a/systems/acme/values.tmpl.yaml
+++ b/systems/acme/values.tmpl.yaml
@@ -9,9 +9,6 @@ cluster:
  {{- if .Requirements.ingress.tls }}
 certmanager:
   production: "{{ .Requirements.ingress.tls.production }}"
-{{- if .Requirements.ingress.tls.enabled }}
   email:  "{{ .Requirements.ingress.tls.email }}"
-{{- else }}
-  enabled: false
-{{- end }}
+  enabled: {{ .Requirements.ingress.tls.enabled }}
 {{- end }}

--- a/systems/cm/requirements.yaml
+++ b/systems/cm/requirements.yaml
@@ -1,4 +1,5 @@
 dependencies:
 - alias: cert-manager
+  condition: cert-manager.enabled
   name: cert-manager
   repository: https://charts.jetstack.io

--- a/systems/cm/values.yaml
+++ b/systems/cm/values.tmpl.yaml
@@ -1,4 +1,5 @@
 cert-manager:
+  enabled: {{ .Requirements.ingress.tls.enabled }}
   rbac:
     create: true
   webhook: