diff --git a/charts/osm/README.md b/charts/osm/README.md index 03d48524e5..69257ef22b 100644 --- a/charts/osm/README.md +++ b/charts/osm/README.md @@ -179,6 +179,7 @@ The following table lists the configurable parameters of the osm chart and their | osm.vault.protocol | string | `"http"` | protocol to use to connect to Vault | | osm.vault.role | string | `"openservicemesh"` | Vault role to be used by Open Service Mesh | | osm.vault.token | string | `""` | token that should be used to connect to Vault | +| osm.vault.tokenSecretName | string | `"osm-vault-token"` | The Kubernetes secret name to store the Vault token used in OSM | | osm.webhookConfigNamePrefix | string | `"osm-webhook"` | Prefix used in name of the webhook configuration resources | | smi.validateTrafficTarget | bool | `true` | Enables validation of SMI Traffic Target | diff --git a/charts/osm/templates/cleanup-hook.yaml b/charts/osm/templates/cleanup-hook.yaml index 28d8dae472..ea491ed9ae 100644 --- a/charts/osm/templates/cleanup-hook.yaml +++ b/charts/osm/templates/cleanup-hook.yaml @@ -84,7 +84,7 @@ spec: kubectl replace -f /osm-crds; kubectl delete --ignore-not-found meshconfig -n '{{ include "osm.namespace" . }}' osm-mesh-config; kubectl delete --ignore-not-found secret -n '{{ include "osm.namespace" . }}' {{ .Values.osm.caBundleSecretName }}; - kubectl delete --ignore-not-found meshrootcertificate -n '{{ include "osm.namespace" }}' osm-mesh-root-certificate; + kubectl delete --ignore-not-found meshrootcertificate -n '{{ include "osm.namespace" . }}' osm-mesh-root-certificate; kubectl delete mutatingwebhookconfiguration -l app.kubernetes.io/name=openservicemesh.io,app.kubernetes.io/instance={{ .Values.osm.meshName }},app.kubernetes.io/version={{ .Chart.AppVersion }},app=osm-injector --ignore-not-found; kubectl delete validatingwebhookconfiguration -l app.kubernetes.io/name=openservicemesh.io,app.kubernetes.io/instance={{ .Values.osm.meshName }},app.kubernetes.io/version={{ .Chart.AppVersion }},app=osm-controller --ignore-not-found; nodeSelector: