Add Role/ClusterRole validation, fix CLI flag:

Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Oct 15, 2024 · d2d9e9d · d2d9e9d
1 parent 92a5cd7
commit d2d9e9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tinkerbell/tink/templates/tink-controller/deployment.yaml b/tinkerbell/tink/templates/tink-controller/deployment.yaml
@@ -23,15 +23,13 @@ spec:
       containers:
         - image: {{ .Values.controller.image }}
           imagePullPolicy: {{ .Values.controller.imagePullPolicy }}
-          {{- if .Values.controller.args }}
           args:
           {{- if eq .Values.controller.rbac.type "Role" }}
-          - --kube-namespace={{ .Release.Namespace }}
+          - --namespace={{ .Release.Namespace }}
           {{- end }}
           {{- range .Values.controller.args }}
             - {{ . }}
           {{- end }}
-          {{- end }}
           name: {{ .Values.controller.name }}
           resources:
             limits:

diff --git a/tinkerbell/tink/values.schema.json b/tinkerbell/tink/values.schema.json
@@ -92,7 +92,8 @@
             "type": "object",
             "properties": {
               "type": {
-                "type": "string"
+                "type": "string",
+                "enum": ["Role", "ClusterRole"]
               },
               "name": {
                 "type": "string"