fix(clusterissuer): try to deal with the fact cert-manager contains a dash
This commit is contained in:
parent
b8b4503cb0
commit
9eb6638145
|
@ -21,7 +21,7 @@ sources:
|
||||||
- https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
|
- https://github.com/truecharts/charts/tree/master/charts/enterprise/clusterissuer
|
||||||
- https://cert-manager.io/
|
- https://cert-manager.io/
|
||||||
type: application
|
type: application
|
||||||
version: 1.0.12
|
version: 1.0.13
|
||||||
annotations:
|
annotations:
|
||||||
truecharts.org/catagories: |
|
truecharts.org/catagories: |
|
||||||
- core
|
- core
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
{{- define "certmanager.clusterissuer.acme" -}}
|
{{- define "certmanager.clusterissuer.acme" -}}
|
||||||
{{- $namespace := "cert-manager" -}}
|
{{- $operator := index $.Values.operator "cert-manager" -}}
|
||||||
{{- if $.Values.operator.certmanager -}}
|
{{- $namespace := $operator.namespace | default "cert-manager" -}}
|
||||||
{{- if $.Values.operator.certmanager.namespace -}}
|
|
||||||
{{- $namespace = $.Values.operator.certmanager.namespace -}}
|
|
||||||
{{- end -}}
|
|
||||||
{{- end -}}
|
|
||||||
{{- range .Values.clusterIssuer.ACME }}
|
{{- range .Values.clusterIssuer.ACME }}
|
||||||
{{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
|
{{- if 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" -}}
|
{{- fail "ACME - Expected name to be all lowercase with hyphens, but not start or end with a hyphen" -}}
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
{{- define "certmanager.clusterissuer.ca" -}}
|
{{- define "certmanager.clusterissuer.ca" -}}
|
||||||
{{- $namespace := "cert-manager" -}}
|
{{- $operator := index $.Values.operator "cert-manager" -}}
|
||||||
{{- if $.Values.operator.certmanager -}}
|
{{- $namespace := $operator.namespace | default "cert-manager" -}}
|
||||||
{{- if $.Values.operator.certmanager.namespace -}}
|
|
||||||
{{- $namespace = $.Values.operator.certmanager.namespace -}}
|
|
||||||
{{- end -}}
|
|
||||||
{{- end -}}
|
|
||||||
|
|
||||||
{{- range .Values.clusterIssuer.CA }}
|
{{- range .Values.clusterIssuer.CA }}
|
||||||
{{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
|
{{- if not (mustRegexMatch "^[a-z]+(-?[a-z]){0,63}-?[a-z]+$" .name) -}}
|
||||||
|
|
Loading…
Reference in New Issue