7f96dad7 by Adam Heath

Allow the ingress class to be changed for letsencrypt.

1 parent 14ef1b3d
...@@ -24,11 +24,11 @@ spec: ...@@ -24,11 +24,11 @@ spec:
24 privateKeySecretRef: 24 privateKeySecretRef:
25 # Secret resource that will be used to store the account's private key. 25 # Secret resource that will be used to store the account's private key.
26 name: acme-account-key 26 name: acme-account-key
27 # Add a single challenge solver, HTTP01 using nginx 27 # Add a single challenge solver, HTTP01 using istio
28 solvers: 28 solvers:
29 - http01: 29 - http01:
30 ingress: 30 ingress:
31 class: nginx 31 class: istio
32 --- 32 ---
33 apiVersion: cert-manager.io/v1 33 apiVersion: cert-manager.io/v1
34 kind: ClusterIssuer 34 kind: ClusterIssuer
...@@ -48,8 +48,8 @@ spec: ...@@ -48,8 +48,8 @@ spec:
48 privateKeySecretRef: 48 privateKeySecretRef:
49 # Secret resource that will be used to store the account's private key. 49 # Secret resource that will be used to store the account's private key.
50 name: acme-account-key 50 name: acme-account-key
51 # Add a single challenge solver, HTTP01 using nginx 51 # Add a single challenge solver, HTTP01 using istio
52 solvers: 52 solvers:
53 - http01: 53 - http01:
54 ingress: 54 ingress:
55 class: nginx 55 class: istio
......
...@@ -7,6 +7,10 @@ clusterIssuer: ...@@ -7,6 +7,10 @@ clusterIssuer:
7 enabled: true 7 enabled: true
8 email: name@example.com 8 email: name@example.com
9 tls_key: replace-me 9 tls_key: replace-me
10 solvers:
11 - http01:
12 ingress:
13 class: istio
10 root-ca: 14 root-ca:
11 crt: null 15 crt: null
12 key: null 16 key: null
......
...@@ -66,6 +66,9 @@ releases: ...@@ -66,6 +66,9 @@ releases:
66 spec: 66 spec:
67 acme: 67 acme:
68 email: {{ .Values.clusterIssuer.letsencrypt.email }} 68 email: {{ .Values.clusterIssuer.letsencrypt.email }}
69 {{- if .Values.clusterIssuer.letsencrypt.solvers }}
70 solvers: {{ .Values.clusterIssuer.letsencrypt.solvers | toYaml | nindent 14 }}
71 {{- end }}
69 {{- else }} 72 {{- else }}
70 $patch: delete 73 $patch: delete
71 {{- end }} 74 {{- end }}
...@@ -78,6 +81,9 @@ releases: ...@@ -78,6 +81,9 @@ releases:
78 spec: 81 spec:
79 acme: 82 acme:
80 email: {{ .Values.clusterIssuer.letsencrypt.email }} 83 email: {{ .Values.clusterIssuer.letsencrypt.email }}
84 {{- if .Values.clusterIssuer.letsencrypt.solvers }}
85 solvers: {{ .Values.clusterIssuer.letsencrypt.solvers | toYaml | nindent 14 }}
86 {{- end }}
81 {{- else }} 87 {{- else }}
82 $patch: delete 88 $patch: delete
83 {{- end }} 89 {{- end }}
......