提交: 477eda6a84e3b780ab046aea3b4b1e15fcf29779 - jenkins-x-boot-config (git)

the default GitOps source repository for booting up Jenkins X

Commit MetaInfo

• 修訂: 477eda6a84e3b780ab046aea3b4b1e15fcf29779 (tree)
• 時間: 2019-07-18 20:20:01
• 作者: James Rawlings <rawlingsj80@gmai...>
• Commiter: GitHub

Log Message

Merge pull request #11 from rawlingsj/cert

feat: update to certmanager v0.8.1 to fix issues with dns solvers being los…

Change Summary

• modified: env/templates/cert-manager-prod-certificate.yaml
• modified: env/templates/cert-manager-prod-issuer.yaml
• modified: env/templates/cert-manager-staging-certificate.yaml
• modified: env/templates/cert-manager-staging-issuer.yaml
• modified: jenkins-x.yml
• modified: systems/cm/requirements.yaml

差異

--- a/env/templates/cert-manager-prod-certificate.yaml
+++ b/env/templates/cert-manager-prod-certificate.yaml
@@ -9,7 +9,7 @@ spec:
     name: letsencrypt-prod
   commonName: "*.{{ .Values.cluster.domain }}"
   dnsNames:
-  - "*.{{ .Values.cluster.domain }}"
+  - "{{ .Values.cluster.domain }}"
   acme:
     config:
     - dns01:

--- a/env/templates/cert-manager-prod-issuer.yaml
+++ b/env/templates/cert-manager-prod-issuer.yaml
@@ -13,14 +13,11 @@ spec:
     solvers:
       # ACME DNS-01 provider configurations
     - dns01:
-        # Here we define a list of DNS-01 providers that can solve DNS challenges
-        providers:
-          - name: jenkins-x-dns
-            clouddns:
-              # A secretKeyRef to a google cloud json service account
-              serviceAccountSecretRef:
-                name: external-dns-gcp-sa
-                key: credentials.json
-              # The project in which to update the DNS zone
-              project: "{{ .Values.cluster.projectID }}"
+        clouddns:
+          # The project in which to update the DNS zone
+          project: "{{ .Values.cluster.projectID }}"
+          # A secretKeyRef to a google cloud json service account
+          serviceAccountSecretRef:
+            name: external-dns-gcp-sa
+            key: credentials.json
 {{- end }}
\ No newline at end of file

--- a/env/templates/cert-manager-staging-certificate.yaml
+++ b/env/templates/cert-manager-staging-certificate.yaml
@@ -9,12 +9,11 @@ spec:
     name: letsencrypt-staging
   commonName: "*.{{ .Values.cluster.domain }}"
   dnsNames:
-  - "*.{{ .Values.cluster.domain }}"
+  - "{{ .Values.cluster.domain }}"
   acme:
     config:
     - dns01:
         provider: jenkins-x-dns
       domains:
       - "*.{{ .Values.cluster.domain }}"
-      - "{{ .Values.cluster.domain }}"
 {{- end }}
\ No newline at end of file

--- a/env/templates/cert-manager-staging-issuer.yaml
+++ b/env/templates/cert-manager-staging-issuer.yaml
@@ -12,15 +12,12 @@ spec:
       name: letsencrypt-staging
     solvers:
       # ACME DNS-01 provider configurations
-      dns01:
-        # Here we define a list of DNS-01 providers that can solve DNS challenges
-        providers:
-          - name: jenkins-x-dns
-            clouddns:
-              # A secretKeyRef to a google cloud json service account
-              serviceAccountSecretRef:
-                name: external-dns-gcp-sa
-                key: credentials.json
-              # The project in which to update the DNS zone
-              project: "{{ .Values.cluster.projectID }}"
+    - dns01:
+        clouddns:
+          # The project in which to update the DNS zone
+          project: "{{ .Values.cluster.projectID }}"
+          # A secretKeyRef to a google cloud json service account
+          serviceAccountSecretRef:
+            name: external-dns-gcp-sa
+            key: credentials.json
 {{- end }}
\ No newline at end of file

--- a/jenkins-x.yml
+++ b/jenkins-x.yml
@@ -36,14 +36,10 @@ pipelineConfig:
               - name: cert-manager-crds
                 dir: /workspace/source
                 command: kubectl
-                args: ['apply', '--wait', '--validate=true', '-f', 'https://raw.githubusercontent.com/jetstack/cert-manager/release-0.6/deploy/manifests/00-crds.yaml']
+                args: ['apply', '--wait', '--validate=true', '-f', 'https://raw.githubusercontent.com/jetstack/cert-manager/release-0.8/deploy/manifests/00-crds.yaml']
                 env:
                   - name: DEPLOY_NAMESPACE
                     value: cert-manager
-              - name: clean-cert-manager
-                dir: /workspace/source
-                command: kubectl
-                args: ['delete', 'issuers.certmanager.k8s.io,certificates.certmanager.k8s.io,challenges.certmanager.k8s.io,orders.certmanager.k8s.io', '--all']
               - name: cert-manager
                 dir: /workspace/source/systems/cm
                 command: jx

--- a/systems/cm/requirements.yaml
+++ b/systems/cm/requirements.yaml
@@ -1,5 +1,5 @@
 dependencies:
 - alias: cert-manager
   name: cert-manager
-  repository: https://kubernetes-charts.storage.googleapis.com
-  version: v0.6.7
+  repository: https://charts.jetstack.io
+  version: v0.8.1
\ No newline at end of file