From 3e00b47fa4bdb1088a2f51ccbcdbd04f7b585727 Mon Sep 17 00:00:00 2001 From: Erik Aaron Hansen Date: Mon, 14 Jan 2019 10:25:46 +0100 Subject: [PATCH] [stable/jenkins] Support custom labels in deployment (#9714) (#10533) * [stable/jenkins] Support custom labels in deployment (#9714) Signed-off-by: Erik Aaron Hansen * [stable/jenkins] Support custom labels in deployment (#9714) Signed-off-by: Erik Aaron Hansen * [stable/jenkins] Support custom labels in deployment (#9714) Signed-off-by: Erik Aaron Hansen --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/jenkins-master-deployment.yaml | 3 +++ stable/jenkins/values.yaml | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 6d707a2a93..4d41009420 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.28.7 +version: 0.28.8 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 034898d9d9..e7f33788d2 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -40,6 +40,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `Master.UseSecurity` | Use basic security | `true` | | `Master.SecurityRealm` | Custom Security Realm | Not set | | `Master.AuthorizationStrategy` | Jenkins XML job config for AuthorizationStrategy | Not set | +| `Master.DeploymentLabels` | Custom Deployment labels | 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/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index 720d949300..1e1172e3c6 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -11,6 +11,9 @@ metadata: release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ .Release.Name }}-{{ .Values.Master.Name }}" + {{- range $key, $val := .Values.Master.DeploymentLabels }} + {{ $key }}: {{ $val | quote }} + {{- end}} spec: replicas: 1 strategy: diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 45c6dd6227..4812fe6f2a 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -58,6 +58,10 @@ Master: ServiceType: LoadBalancer # Master Service annotations ServiceAnnotations: {} + # Master Custom Labels + DeploymentLabels: + # foo: bar + # bar: foo # Master Service Labels ServiceLabels: {} # service.beta.kubernetes.io/aws-load-balancer-backend-protocol: https