diff --git a/enterprise/clusterissuer/4.0.2/app-changelog.md b/enterprise/clusterissuer/4.0.2/app-changelog.md deleted file mode 100644 index dfe935b72d..0000000000 --- a/enterprise/clusterissuer/4.0.2/app-changelog.md +++ /dev/null @@ -1,13 +0,0 @@ - - -## [clusterissuer-4.0.2](https://github.com/truecharts/charts/compare/clusterissuer-4.0.1...clusterissuer-4.0.2) (2023-10-04) - -### Docs - -- remove quad9 ([#11376](https://github.com/truecharts/charts/issues/11376)) - - ### Fix - -- handle tsig secret encoding ([#13245](https://github.com/truecharts/charts/issues/13245)) - - \ No newline at end of file diff --git a/enterprise/clusterissuer/4.0.2/CHANGELOG.md b/enterprise/clusterissuer/4.1.0/CHANGELOG.md similarity index 90% rename from enterprise/clusterissuer/4.0.2/CHANGELOG.md rename to enterprise/clusterissuer/4.1.0/CHANGELOG.md index ebe7c24173..974a017f66 100644 --- a/enterprise/clusterissuer/4.0.2/CHANGELOG.md +++ b/enterprise/clusterissuer/4.1.0/CHANGELOG.md @@ -4,6 +4,15 @@ +## [clusterissuer-4.1.0](https://github.com/truecharts/charts/compare/clusterissuer-4.0.2...clusterissuer-4.1.0) (2023-10-04) + +### Clusterissuer + +- add ACME DNS issuer ([#11483](https://github.com/truecharts/charts/issues/11483)) + + + + ## [clusterissuer-4.0.2](https://github.com/truecharts/charts/compare/clusterissuer-4.0.1...clusterissuer-4.0.2) (2023-10-04) ### Docs @@ -88,12 +97,3 @@ - -## [clusterissuer-1.0.12](https://github.com/truecharts/charts/compare/clusterissuer-1.0.11...clusterissuer-1.0.12) (2023-07-19) - -### Fix - -- ensure clusterissuer is compatible with new cert-manager operator - - - diff --git a/enterprise/clusterissuer/4.0.2/Chart.yaml b/enterprise/clusterissuer/4.1.0/Chart.yaml similarity index 98% rename from enterprise/clusterissuer/4.0.2/Chart.yaml rename to enterprise/clusterissuer/4.1.0/Chart.yaml index e04da90491..cac31c4a98 100644 --- a/enterprise/clusterissuer/4.0.2/Chart.yaml +++ b/enterprise/clusterissuer/4.1.0/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer - https://cert-manager.io/ type: application -version: 4.0.2 +version: 4.1.0 annotations: truecharts.org/catagories: | - core diff --git a/enterprise/clusterissuer/4.0.2/LICENSE b/enterprise/clusterissuer/4.1.0/LICENSE similarity index 100% rename from enterprise/clusterissuer/4.0.2/LICENSE rename to enterprise/clusterissuer/4.1.0/LICENSE diff --git a/enterprise/clusterissuer/4.0.2/README.md b/enterprise/clusterissuer/4.1.0/README.md similarity index 100% rename from enterprise/clusterissuer/4.0.2/README.md rename to enterprise/clusterissuer/4.1.0/README.md diff --git a/enterprise/clusterissuer/4.1.0/app-changelog.md b/enterprise/clusterissuer/4.1.0/app-changelog.md new file mode 100644 index 0000000000..0c9ce9885a --- /dev/null +++ b/enterprise/clusterissuer/4.1.0/app-changelog.md @@ -0,0 +1,9 @@ + + +## [clusterissuer-4.1.0](https://github.com/truecharts/charts/compare/clusterissuer-4.0.2...clusterissuer-4.1.0) (2023-10-04) + +### Clusterissuer + +- add ACME DNS issuer ([#11483](https://github.com/truecharts/charts/issues/11483)) + + \ No newline at end of file diff --git a/enterprise/clusterissuer/4.0.2/app-readme.md b/enterprise/clusterissuer/4.1.0/app-readme.md similarity index 100% rename from enterprise/clusterissuer/4.0.2/app-readme.md rename to enterprise/clusterissuer/4.1.0/app-readme.md diff --git a/enterprise/clusterissuer/4.0.2/charts/common-14.0.1.tgz b/enterprise/clusterissuer/4.1.0/charts/common-14.0.1.tgz similarity index 100% rename from enterprise/clusterissuer/4.0.2/charts/common-14.0.1.tgz rename to enterprise/clusterissuer/4.1.0/charts/common-14.0.1.tgz diff --git a/enterprise/clusterissuer/4.0.2/ix_values.yaml b/enterprise/clusterissuer/4.1.0/ix_values.yaml similarity index 83% rename from enterprise/clusterissuer/4.0.2/ix_values.yaml rename to enterprise/clusterissuer/4.1.0/ix_values.yaml index 264f47ed25..4903d7a582 100644 --- a/enterprise/clusterissuer/4.0.2/ix_values.yaml +++ b/enterprise/clusterissuer/4.1.0/ix_values.yaml @@ -59,7 +59,7 @@ clusterIssuer: # # Used primarily for the SCALE GUI # customServer: 'https://acme-staging-v02.api.letsencrypt.org/directory' # email: "" -# # Options: HTTP01, cloudflare, route53 +# # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns # type: "" # # for cloudflare # cfapikey: "" @@ -82,3 +82,15 @@ clusterIssuer: # tsigKeyName: "" # tsigAlgorithm: "" # rfctsigSecret: "" +# # for acmedns +# name: sd +# acmednsHost: asdf +# # Pick one of the bellow acmednsConfig +# acmednsConfigJson: +# acmednsConfig: +# - domain: "" +# username: "" +# password: "" +# fulldomain: "" +# subdomain: "" +# allowFrom: [] diff --git a/enterprise/clusterissuer/4.0.2/questions.yaml b/enterprise/clusterissuer/4.1.0/questions.yaml similarity index 82% rename from enterprise/clusterissuer/4.0.2/questions.yaml rename to enterprise/clusterissuer/4.1.0/questions.yaml index 29c9f3a5a8..e9c9d78962 100644 --- a/enterprise/clusterissuer/4.0.2/questions.yaml +++ b/enterprise/clusterissuer/4.1.0/questions.yaml @@ -89,6 +89,8 @@ questions: description: rfc2136 (Advanced) - value: HTTP01 description: HTTP01 (Experimental) + - value: acmedns + description: ACME DNS (Advanced) - variable: server label: Server description: "Server for ACME, for example: letsencrypt" @@ -237,7 +239,64 @@ questions: type: string required: true default: "" - + - variable: acmednsHost + label: ACME DNS host + description: "ACME DNS API server address" + schema: + show_if: [["type", "=", "acmedns"]] + type: string + required: true + default: "https://auth.acme-dns.io" + - variable: acmednsConfig + label: ACME DNS config + description: "ACME DNS per-domain auth configuration" + schema: + show_if: [["type", "=", "acmedns"]] + type: list + default: [] + items: + - variable: acmednsEntry + label: 'ACME DNS entry' + schema: + type: dict + attrs: + - variable: domain + label: Domain + schema: + type: string + required: true + - variable: username + label: Username + schema: + type: string + required: true + - variable: password + label: Password + schema: + type: string + required: true + - variable: fulldomain + label: Full domain + schema: + type: string + required: true + - variable: subdomain + label: Subdomain + schema: + type: string + required: true + - variable: allowFrom + label: Allow from + schema: + type: list + default: [] + items: + - variable: cidr + label: CIDR + schema: + type: ipaddr + cidr: true + required: true - variable: CA label: Certificate Authority Issuer schema: diff --git a/enterprise/clusterissuer/4.0.2/templates/NOTES.txt b/enterprise/clusterissuer/4.1.0/templates/NOTES.txt similarity index 100% rename from enterprise/clusterissuer/4.0.2/templates/NOTES.txt rename to enterprise/clusterissuer/4.1.0/templates/NOTES.txt diff --git a/enterprise/clusterissuer/4.0.2/templates/clusterissuer/_ACME.tpl b/enterprise/clusterissuer/4.1.0/templates/clusterissuer/_ACME.tpl similarity index 82% rename from enterprise/clusterissuer/4.0.2/templates/clusterissuer/_ACME.tpl rename to enterprise/clusterissuer/4.1.0/templates/clusterissuer/_ACME.tpl index 0922452e79..7f8b2aa451 100644 --- a/enterprise/clusterissuer/4.0.2/templates/clusterissuer/_ACME.tpl +++ b/enterprise/clusterissuer/4.1.0/templates/clusterissuer/_ACME.tpl @@ -11,14 +11,21 @@ {{- end -}} {{- range .Values.clusterIssuer.ACME }} - {{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}} + {{- if or (not .name) (not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name)) -}} {{- fail "ACME - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}} {{- end -}} - {{- $validTypes := list "HTTP01" "cloudflare" "route53" "digitalocean" "akamai" "rfc2136" -}} + {{- $validTypes := list "HTTP01" "cloudflare" "route53" "digitalocean" "akamai" "rfc2136" "acmedns" -}} {{- if not (mustHas .type $validTypes) -}} {{- fail (printf "Expected ACME type to be one of [%s], but got [%s]" (join ", " $validTypes) .type) -}} {{- end -}} {{- $issuerSecretName := printf "%s-clusterissuer-secret" .name }} + {{- $acmednsDict := dict -}} + {{- if and (eq .type "acmedns") (not .acmednsConfigJson) }} + {{- range .acmednsConfig }} + {{/* Transform to a dict with domain as a key, also remove domain from the dict */}} + {{- $_ := set $acmednsDict .domain (omit . "domain") -}} + {{- end }} + {{- end -}} --- apiVersion: cert-manager.io/v1 kind: ClusterIssuer @@ -85,6 +92,12 @@ spec: tsigSecretSecretRef: name: {{ $issuerSecretName }} key: rfctsigSecret + {{- else if eq .type "acmedns" }} + acmeDNS: + host: {{ .acmednsHost }} + accountSecretRef: + name: {{ $issuerSecretName }} + key: acmednsJson {{- end -}} {{- end }} --- @@ -103,5 +116,10 @@ stringData: akaccessToken: {{ .akaccessToken | default "" }} doaccessToken: {{ .doaccessToken | default "" }} rfctsigSecret: {{ $rfctsigSecret }} -{{- end }} +{{- if .acmednsConfigJson }} + acmednsJson: {{ .acmednsConfigJson }} +{{- else if $acmednsDict }} + acmednsJson: {{ toJson $acmednsDict }} +{{- end -}} + {{- end -}} {{- end -}} diff --git a/enterprise/clusterissuer/4.0.2/templates/clusterissuer/_CA.tpl b/enterprise/clusterissuer/4.1.0/templates/clusterissuer/_CA.tpl similarity index 100% rename from enterprise/clusterissuer/4.0.2/templates/clusterissuer/_CA.tpl rename to enterprise/clusterissuer/4.1.0/templates/clusterissuer/_CA.tpl diff --git a/enterprise/clusterissuer/4.0.2/templates/clusterissuer/_selfSigned.tpl b/enterprise/clusterissuer/4.1.0/templates/clusterissuer/_selfSigned.tpl similarity index 100% rename from enterprise/clusterissuer/4.0.2/templates/clusterissuer/_selfSigned.tpl rename to enterprise/clusterissuer/4.1.0/templates/clusterissuer/_selfSigned.tpl diff --git a/enterprise/clusterissuer/4.0.2/templates/common.yaml b/enterprise/clusterissuer/4.1.0/templates/common.yaml similarity index 100% rename from enterprise/clusterissuer/4.0.2/templates/common.yaml rename to enterprise/clusterissuer/4.1.0/templates/common.yaml diff --git a/enterprise/clusterissuer/4.0.2/values.yaml b/enterprise/clusterissuer/4.1.0/values.yaml similarity index 100% rename from enterprise/clusterissuer/4.0.2/values.yaml rename to enterprise/clusterissuer/4.1.0/values.yaml