Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions charts/zrok2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 |

Expand Down
2 changes: 1 addition & 1 deletion charts/zrok2/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/zrok2/templates/controller-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/zrok2/templates/frontend-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/zrok2/templates/pre-delete-hook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions charts/zrok2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down