diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index bc9ff04291..969f205a73 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.23.0 +version: 0.24.0 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 diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index 55e7fd7c1f..24073d2d7d 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -38,6 +38,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `Master.Component` | k8s selector key | `jenkins-master` | | `Master.UseSecurity` | Use basic security | `true` | | `Master.SecurityRealm` | Custom Security Realm | Not set | +| `Master.AuthorizationStrategy` | Jenkins XML job config for AuthorizationStrategy | Not set | | `Master.ServiceLabels` | Custom Service labels | Not set | | `Master.AdminUser` | Admin username (and password) created as a secret if useSecurity is true | `admin` | | `Master.AdminPassword` | Admin password (and user) created as a secret if useSecurity is true | Random value | diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index 2d5d2568b1..fd84a4211d 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -13,9 +13,13 @@ data: 0 NORMAL {{ .Values.Master.UseSecurity }} +{{- if not (empty .Values.Master.AuthorizationStrategy ) }} +{{ .Values.Master.AuthorizationStrategy | indent 6 }} +{{- else }} true +{{- end }} {{- if .Values.Master.SecurityRealm }} {{ .Values.Master.SecurityRealm | indent 6 }} {{- else }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 8ca10c09d5..66fc0bf530 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -16,7 +16,12 @@ Master: # ImagePullSecret: jenkins Component: "jenkins-master" UseSecurity: true - # SecurityRealm + # SecurityRealm: + # Optionally configure a different AuthorizationStrategy using Jenkins XML + # AuthorizationStrategy: |- + # + # true + # HostNetworking: false AdminUser: admin # AdminPassword: