[stable/jenkins] Add role kind option (#8498)

* [stable/jenkins] Add role kind option

Signed-off-by: Dale Tristram <dale.tristram@sprinthive.com>

* [stable/jenkins] Update chart version

Signed-off-by: Dale Tristram <dale.tristram@sprinthive.com>

stable/jenkins/Chart.yaml

@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.28.4
+version: 0.28.5
 appVersion: lts
 description: Open source continuous integration server. It supports multiple SCM tools
   including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based

stable/jenkins/README.md

@@ -87,7 +87,8 @@ The following tables list the configurable parameters of the Jenkins chart and t
 | `NetworkPolicy.ApiVersion`        | NetworkPolicy ApiVersion             | `networking.k8s.io/v1`                                                         |
 | `rbac.install`                    | Create service account and ClusterRoleBinding for Kubernetes plugin | `false`                                       |
 | `rbac.roleRef`                    | Cluster role name to bind to         | `cluster-admin`                                                              |
-| `rbac.roleBindingKind`            | Role kind (`RoleBinding` or `ClusterRoleBinding`)| `ClusterRoleBinding`                                             |
+| `rbac.roleKind`            | Role kind (`Role` or `ClusterRole`)| `ClusterRole`
+| `rbac.roleBindingKind`            | Role binding kind (`RoleBinding` or `ClusterRoleBinding`)| `ClusterRoleBinding`                                             |
 
 ### Jenkins Agent
 

stable/jenkins/templates/rbac.yaml

@@ -17,7 +17,7 @@ metadata:
     heritage: "{{ .Release.Service }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
+  kind: {{ .Values.rbac.roleKind }}
   name: {{ .Values.rbac.roleRef }}
 subjects:
 - kind: ServiceAccount

stable/jenkins/values.yaml

@@ -222,7 +222,9 @@ rbac:
   serviceAccountName: default
   # Role reference
   roleRef: cluster-admin
-  # Role kind (RoleBinding or ClusterRoleBinding)
+  # Role kind (Role or ClusterRole)
+  roleKind: ClusterRole
+  # Role binding kind (RoleBinding or ClusterRoleBinding)
   roleBindingKind: ClusterRoleBinding
 
 ## Backup cronjob configuration