Skip to content

Commit c5f8bac

Browse files
authored
Merge pull request cert-manager#131 from SgtCoDFish/allowallsigners
Allow use of all signers by default
2 parents a8c5e22 + a0e56b4 commit c5f8bac

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

deploy/charts/csi-driver-spiffe/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ Number of replicas of the approver to run.
326326
#### **app.approver.signerName** ~ `string`
327327
> Default value:
328328
> ```yaml
329-
> clusterissuers.cert-manager.io/*
329+
> ""
330330
> ```
331331

332-
The signer name that csi-driver-spiffe approver will be given permission to approve and deny. CertificateRequests referencing this signer name can be processed by the SPIFFE approver. See: https://cert-manager.io/docs/concepts/certificaterequest/#approval
332+
A signer name that the csi-driver-spiffe approver will be given permission to approve and deny. CertificateRequests referencing this signer name can be processed by the SPIFFE approver. See: https://cert-manager.io/docs/concepts/certificaterequest/#approval. Defaults to empty which allows approval for all signers
333333
#### **app.approver.readinessProbe.port** ~ `number`
334334
> Default value:
335335
> ```yaml

deploy/charts/csi-driver-spiffe/templates/clusterrole.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,16 @@ rules:
2323
resources: ["certificaterequests/status"]
2424
verbs: ["update"]
2525

26+
{{- if .Values.app.approver.signerName }}
2627
- apiGroups: ["cert-manager.io"]
2728
resources: ["signers"]
2829
verbs: ["approve"]
2930
resourceNames: ["{{.Values.app.approver.signerName}}"]
31+
{{- else }}
32+
- apiGroups: ["cert-manager.io"]
33+
resources: ["signers"]
34+
verbs: ["approve"]
35+
{{- end }}
3036
- apiGroups: [""]
3137
resources: ["events"]
3238
verbs: ["create", "patch"]

deploy/charts/csi-driver-spiffe/values.schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@
188188
"type": "object"
189189
},
190190
"helm-values.app.approver.signerName": {
191-
"default": "clusterissuers.cert-manager.io/*",
192-
"description": "The signer name that csi-driver-spiffe approver will be given permission to approve and deny. CertificateRequests referencing this signer name can be processed by the SPIFFE approver. See: https://cert-manager.io/docs/concepts/certificaterequest/#approval",
191+
"default": "",
192+
"description": "A signer name that the csi-driver-spiffe approver will be given permission to approve and deny. CertificateRequests referencing this signer name can be processed by the SPIFFE approver. See: https://cert-manager.io/docs/concepts/certificaterequest/#approval. Defaults to empty which allows approval for all signers",
193193
"type": "string"
194194
},
195195
"helm-values.app.certificateRequestDuration": {

deploy/charts/csi-driver-spiffe/values.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,14 @@ app:
165165
approver:
166166
# Number of replicas of the approver to run.
167167
replicaCount: 1
168-
# The signer name that csi-driver-spiffe approver will be given
168+
169+
# A signer name that the csi-driver-spiffe approver will be given
169170
# permission to approve and deny. CertificateRequests referencing this
170171
# signer name can be processed by the SPIFFE approver. See:
171172
# https://cert-manager.io/docs/concepts/certificaterequest/#approval
172-
signerName: "clusterissuers.cert-manager.io/*"
173+
# Defaults to empty which allows approval for all signers
174+
signerName: ""
175+
173176
readinessProbe:
174177
# Container port to expose csi-driver-spiffe-approver HTTP readiness
175178
# probe on default network interface.

0 commit comments

Comments
 (0)