Skip to content

Commit bddb976

Browse files
authored
fix(helm): fix manager.rbac.strict being no-op (#2084)
Signed-off-by: Hristo Hristov <me@hhristov.info>
1 parent bd197b8 commit bddb976

4 files changed

Lines changed: 10 additions & 1 deletion

File tree

charts/capsule/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ The following Values have changed key or Value:
170170
| manager.rbac.create | bool | `true` | Specifies whether RBAC resources should be created. |
171171
| manager.rbac.existingClusterRoles | list | `[]` | Specifies further cluster roles to be added to the Capsule manager service account. |
172172
| manager.rbac.existingRoles | list | `[]` | Specifies further cluster roles to be added to the Capsule manager service account. |
173+
| manager.rbac.minimal | bool | `false` | DEPRECATED: use strict instead. Former name of the strict option; takes effect when either flag is true. |
173174
| manager.rbac.role.extraResources | list | `[]` | Extra namespaced RBAC PolicyRules to add to a Role created by this chart and bound to the Capsule ServiceAccount. |
174175
| manager.rbac.strict | bool | `false` | Strongly restrict the RBAC assigned to Capsule Controller. When set to true you must aggregate further permissions by yourself. |
175176
| manager.readinessProbe | object | `{"httpGet":{"path":"/readyz","port":10080}}` | Configure the readiness probe using Deployment probe spec |

charts/capsule/templates/rbac.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ subjects:
106106
- kind: ServiceAccount
107107
name: {{ include "capsule.serviceAccountName" . }}
108108
namespace: {{ .Release.Namespace }}
109-
{{- if $.Values.manager.rbac.minimal }}
109+
{{- if or $.Values.manager.rbac.strict $.Values.manager.rbac.minimal }}
110110
---
111111
kind: ClusterRoleBinding
112112
apiVersion: rbac.authorization.k8s.io/v1

charts/capsule/values.schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,10 @@
693693
"description": "Specifies further cluster roles to be added to the Capsule manager service account.",
694694
"type": "array"
695695
},
696+
"minimal": {
697+
"description": "DEPRECATED: use strict instead. Former name of the strict option; takes effect when either flag is true.",
698+
"type": "boolean"
699+
},
696700
"role": {
697701
"type": "object",
698702
"properties": {

charts/capsule/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ manager:
156156
# When set to true you must aggregate further permissions by yourself.
157157
strict: false
158158

159+
# -- DEPRECATED: use strict instead.
160+
# Former name of the strict option; takes effect when either flag is true.
161+
minimal: false
162+
159163
# -- Specifies further cluster roles to be added to the Capsule manager service account.
160164
existingClusterRoles: []
161165
# - cluster-admin

0 commit comments

Comments
 (0)