Skip to content

Commit 8639c3f

Browse files
committed
refactor: Restructure global ACME config and improve template logic
- Replaced `global.defaults` with `global.acme` for clarity and extensibility
1 parent aacae9f commit 8639c3f

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ helm install cluster-issuers ./ -f values.yaml
3333

3434
```yaml
3535
global:
36-
defaults: # Optional
36+
acme: # Defaults for all clusterIssuers below, can be overridden per issuer
3737
email: your-email@example.com
3838
solvers:
3939
- http01:
@@ -44,11 +44,12 @@ clusterIssuers:
4444
letsencrypt-prod:
4545
server: https://acme-v02.api.letsencrypt.org/directory
4646
privateKeySecret: letsencrypt-prod
47+
# email, solvers will fallback to global.acme
4748

4849
letsencrypt-staging:
49-
email: staging@example.com
5050
server: https://acme-staging-v02.api.letsencrypt.org/directory
5151
privateKeySecret: letsencrypt-staging
52+
email: staging@example.com # overrides global.acme.email
5253
solvers:
5354
- http01:
5455
ingress:

charts/cluster-issuers/templates/cluster-issuers.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
name: {{ $name }}
66
spec:
77
acme:
8-
email: {{ default $.Values.global.email $issuer.email }}
8+
email: {{ default $.Values.global.acme.email $issuer.email }}
99
server: {{ $issuer.server }}
1010
privateKeySecretRef:
1111
name: {{ $issuer.privateKeySecret }}
1212
solvers:
1313
{{- if hasKey $issuer "solvers" }}
14-
{{ toYaml $issuer.solvers | indent 6 }}
15-
{{- else if hasKey $.Values.global "solvers" }}
16-
{{ toYaml $.Values.global.solvers | indent 6 }}
14+
{{ toYaml $issuer.solvers | indent 4 }}
15+
{{- else if hasKey $.Values.global.acme "solvers" }}
16+
{{ toYaml $.Values.global.acme.solvers | indent 4 }}
1717
{{- else }}
1818
- http01:
1919
ingress:

0 commit comments

Comments
 (0)