diff --git a/charts/zrok2/README.md b/charts/zrok2/README.md index 27f57144..b50ccb5a 100644 --- a/charts/zrok2/README.md +++ b/charts/zrok2/README.md @@ -73,7 +73,7 @@ helm upgrade \ --values https://raw.githubusercontent.com/openziti/helm-charts/main/charts/zrok2/values-ingress-traefik.yaml \ --set "ziti.advertisedHost=${ZITI_MGMT_API_HOST}" \ --set "ziti.password=${ZITI_PWD}" \ - --set "ziti.caSecretName=ziti-controller1-ctrl-plane-cas" \ + --set "ziti.ca_cert_configmap=ziti-controller1-ctrl-plane-cas" \ --set "dnsZone=${ZROK2_DNS_ZONE}" \ --set "controller.ingress.hosts[0]=zrok2.${ZROK2_DNS_ZONE}" \ zrok2 openziti/zrok2 @@ -217,9 +217,9 @@ zrok2 traefik zrok2.zrok.192.168.49.2.sslip.io 192.168.49.2 80 8m41s | tolerations | list | `[]` | | | ziti.advertisedHost | string | `"ziti-controller.ziti.svc.cluster.local"` | The Ziti Management API host | | ziti.advertisedPort | string | `"1280"` | The Ziti Management API port | -| ziti.caSecretName | string | `"ziti-controller-ctrl-plane-cas"` | name of the secret containing the Ziti CA certificate trust bundle | -| ziti.ca_cert_dir | string | `"/etc/ziti"` | mountpoint of the Ziti CA certificate trust bundle | -| ziti.ca_cert_file | string | `"ctrl-plane-cas.crt"` | key name of trust bundle in secret and filename to project into mountpoint | +| ziti.ca_cert_configmap | string | `"ziti-controller-ctrl-plane-cas"` | name of the configmap containing the Ziti CA certificate trust bundle | +| ziti.ca_cert_dir | string | `"/etc/ziti"` | mountpoint of the Ziti CA certificate trust bundle | +| ziti.ca_cert_file | string | `"ctrl-plane-cas.crt"` | key name of trust bundle in configmap and filename to project into mountpoint | | ziti.password | string | `""` | Ziti admin login password | | ziti.username | string | `"admin"` | Ziti admin login name | diff --git a/charts/zrok2/README.md.gotmpl b/charts/zrok2/README.md.gotmpl index ce6f2d1d..01ea6b4f 100644 --- a/charts/zrok2/README.md.gotmpl +++ b/charts/zrok2/README.md.gotmpl @@ -72,7 +72,7 @@ helm upgrade \ --values https://raw.githubusercontent.com/openziti/helm-charts/main/charts/zrok2/values-ingress-traefik.yaml \ --set "ziti.advertisedHost=${ZITI_MGMT_API_HOST}" \ --set "ziti.password=${ZITI_PWD}" \ - --set "ziti.caSecretName=ziti-controller1-ctrl-plane-cas" \ + --set "ziti.ca_cert_configmap=ziti-controller1-ctrl-plane-cas" \ --set "dnsZone=${ZROK2_DNS_ZONE}" \ --set "controller.ingress.hosts[0]=zrok2.${ZROK2_DNS_ZONE}" \ zrok2 openziti/zrok2 diff --git a/charts/zrok2/templates/controller-deployment.yaml b/charts/zrok2/templates/controller-deployment.yaml index 755e5e75..2901c9cb 100644 --- a/charts/zrok2/templates/controller-deployment.yaml +++ b/charts/zrok2/templates/controller-deployment.yaml @@ -121,7 +121,7 @@ spec: path: bootstrap-ziti.bash - name: ziti-ctrl-plane-cas configMap: - name: {{ .Values.ziti.caSecretName }} + name: {{ .Values.ziti.ca_cert_configmap }} defaultMode: 0444 items: - key: {{ .Values.ziti.ca_cert_file }} diff --git a/charts/zrok2/templates/frontend-deployment.yaml b/charts/zrok2/templates/frontend-deployment.yaml index 0819fc4b..993e112d 100644 --- a/charts/zrok2/templates/frontend-deployment.yaml +++ b/charts/zrok2/templates/frontend-deployment.yaml @@ -140,7 +140,7 @@ spec: path: bootstrap-frontend.bash - name: ziti-ctrl-plane-cas configMap: - name: {{ .Values.ziti.caSecretName }} + name: {{ .Values.ziti.ca_cert_configmap }} defaultMode: 0444 items: - key: {{ .Values.ziti.ca_cert_file }} diff --git a/charts/zrok2/templates/pre-delete-hook.yaml b/charts/zrok2/templates/pre-delete-hook.yaml index 24bbe238..da7ec725 100644 --- a/charts/zrok2/templates/pre-delete-hook.yaml +++ b/charts/zrok2/templates/pre-delete-hook.yaml @@ -88,7 +88,7 @@ spec: path: ctrl.yaml - name: ziti-ctrl-plane-cas configMap: - name: {{ .Values.ziti.caSecretName }} + name: {{ .Values.ziti.ca_cert_configmap }} defaultMode: 0444 items: - key: {{ .Values.ziti.ca_cert_file }} diff --git a/charts/zrok2/values.yaml b/charts/zrok2/values.yaml index 85ac9f76..0a3223d3 100644 --- a/charts/zrok2/values.yaml +++ b/charts/zrok2/values.yaml @@ -149,11 +149,11 @@ ziti: username: admin # -- Ziti admin login password password: "" - # -- name of the secret containing the Ziti CA certificate trust bundle - caSecretName: ziti-controller-ctrl-plane-cas + # -- name of the configmap containing the Ziti CA certificate trust bundle + ca_cert_configmap: ziti-controller-ctrl-plane-cas # -- mountpoint of the Ziti CA certificate trust bundle ca_cert_dir: /etc/ziti - # -- key name of trust bundle in secret and filename to project into mountpoint + # -- key name of trust bundle in configmap and filename to project into mountpoint ca_cert_file: ctrl-plane-cas.crt # -- The DNS zone with a wildcard * A record to use for the zrok2 public frontend