diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index e20ae64..38d021a 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -47,6 +47,7 @@ A Helm chart to install the SPIRE server. | controllerManager.service.annotations | object | `{}` | | | controllerManager.service.port | int | `443` | | | controllerManager.service.type | string | `"ClusterIP"` | | +| controllerManager.validatingWebhookConfiguration.failurePolicy | string | `"Fail"` | | | dataStorage.accessMode | string | `"ReadWriteOnce"` | | | dataStorage.enabled | bool | `true` | | | dataStorage.size | string | `"1Gi"` | | diff --git a/charts/spire/charts/spire-server/templates/controller-manager-webhook.yaml b/charts/spire/charts/spire-server/templates/controller-manager-webhook.yaml index 6f963fc..1e55403 100644 --- a/charts/spire/charts/spire-server/templates/controller-manager-webhook.yaml +++ b/charts/spire/charts/spire-server/templates/controller-manager-webhook.yaml @@ -10,7 +10,7 @@ webhooks: name: {{ include "spire-controller-manager.fullname" . }}-webhook namespace: {{ include "spire-server.namespace" . }} path: /validate-spire-spiffe-io-v1alpha1-clusterfederatedtrustdomain - failurePolicy: Fail + failurePolicy: {{ .Values.controllerManager.validatingWebhookConfiguration.failurePolicy }} name: vclusterfederatedtrustdomain.kb.io rules: - apiGroups: ["spire.spiffe.io"] @@ -24,7 +24,7 @@ webhooks: name: {{ include "spire-controller-manager.fullname" . }}-webhook namespace: {{ include "spire-server.namespace" . }} path: /validate-spire-spiffe-io-v1alpha1-clusterspiffeid - failurePolicy: Fail + failurePolicy: {{ .Values.controllerManager.validatingWebhookConfiguration.failurePolicy }} name: vclusterspiffeid.kb.io rules: - apiGroups: ["spire.spiffe.io"] diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 4ebfc9b..5768c0b 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -174,6 +174,9 @@ controllerManager: dnsNameTemplates: [] # - '{{ index .PodMeta.Labels "app.kubernetes.io/name" }}.{{ .PodMeta.Namespace }}.svc.cluster.local' + validatingWebhookConfiguration: + failurePolicy: Fail + telemetry: prometheus: enabled: false