diff --git a/charts/premium/clusterissuer/Chart.yaml b/charts/premium/clusterissuer/Chart.yaml index c99e2c5b59b..dbe8ff2653c 100644 --- a/charts/premium/clusterissuer/Chart.yaml +++ b/charts/premium/clusterissuer/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/premium/clusterissuer - https://hub.docker.com/_/hello-world type: application -version: 9.5.3 +version: 9.6.0 diff --git a/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl b/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl index 7297ee3439c..3869804de31 100644 --- a/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl +++ b/charts/premium/clusterissuer/templates/clusterissuer/_ACME.tpl @@ -14,7 +14,7 @@ {{- if or (not .name) (not (mustRegexMatch "^[a-z0-9]+(-[a-z0-9]+)*$" .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" "acmedns" -}} + {{- $validTypes := list "HTTP01" "cloudflare" "route53" "digitalocean" "akamai" "rfc2136" "acmedns" "webhook" -}} {{- if not (mustHas .type $validTypes) -}} {{- fail (printf "Expected ACME type to be one of [%s], but got [%s]" (join ", " $validTypes) .type) -}} {{- end -}} @@ -101,6 +101,16 @@ spec: accountSecretRef: name: {{ $issuerSecretName }} key: acmednsJson + {{- else if eq .type "webhook" }} + webhook: + groupName: {{ .groupName }} + solverName: {{ .solverName }} + {{- if .config }} + config: + {{- range $configkey, $configvalue := .config }} + {{ $configkey }}: {{ $configvalue }} + {{- end }} + {{- end }} {{- end -}} {{- end }} --- diff --git a/charts/premium/clusterissuer/values.yaml b/charts/premium/clusterissuer/values.yaml index cc51498feeb..d6dadc0ef91 100644 --- a/charts/premium/clusterissuer/values.yaml +++ b/charts/premium/clusterissuer/values.yaml @@ -53,7 +53,7 @@ clusterIssuer: # # Used primarily for the SCALE GUI # customServer: 'https://acme-staging-v02.api.letsencrypt.org/directory' # email: "" -# # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns +# # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns, webhook # type: "" # # for cloudflare # cfapikey: "" @@ -88,6 +88,13 @@ clusterIssuer: # fulldomain: "" # subdomain: "" # allowFrom: [] +# # for webhook +# groupName: "" +# solverName: "" +# # config is optional +# config: +# key1: value1 +# key2: value2 clusterCertificates: # Namespaces in which the certificates must be available diff --git a/clustertool/embed/generic/kubernetes/core/clusterissuer/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/core/clusterissuer/app/helm-release.yaml index db920dc8ede..21a478e340c 100644 --- a/clustertool/embed/generic/kubernetes/core/clusterissuer/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/core/clusterissuer/app/helm-release.yaml @@ -40,7 +40,7 @@ spec: # Used for both logging in to the DNS provider AND ACME registration email: "${DOMAIN_0_EMAIL}" server: 'https://acme-staging-v02.api.letsencrypt.org/directory' - # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns + # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns, webhook type: "cloudflare" # for cloudflare cfapitoken: "${DOMAIN_0_CLOUDFLARE_TOKEN}" @@ -48,7 +48,7 @@ spec: # Used for both logging in to the DNS provider AND ACME registration email: "${DOMAIN_0_EMAIL}" server: 'https://acme-v02.api.letsencrypt.org/directory' - # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns + # Options: HTTP01, cloudflare, route53, akamai, digitalocean, rfc2136, acmedns, webhook type: "cloudflare" # for cloudflare cfapitoken: "${DOMAIN_0_CLOUDFLARE_TOKEN}"