From 3a7660edd7e45bd132828dad0239c6d45b637006 Mon Sep 17 00:00:00 2001 From: Lachlan Evenson Date: Mon, 5 Jun 2017 11:20:06 -0700 Subject: [PATCH] add configurable service annotations #1234 --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/templates/jenkins-master-svc.yaml | 4 ++++ stable/jenkins/values.yaml | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 604dd06327ca..edb23f32820f 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.7.2 +version: 0.7.3 appVersion: 2.46.3 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 projects as well as arbitrary scripts. sources: diff --git a/stable/jenkins/templates/jenkins-master-svc.yaml b/stable/jenkins/templates/jenkins-master-svc.yaml index 20b45b749844..3152ccb74813 100644 --- a/stable/jenkins/templates/jenkins-master-svc.yaml +++ b/stable/jenkins/templates/jenkins-master-svc.yaml @@ -8,6 +8,10 @@ metadata: release: {{.Release.Name | quote }} chart: "{{.Chart.Name}}-{{.Chart.Version}}" component: "{{.Release.Name}}-{{.Values.Master.Component}}" +{{- if .Values.Master.ServiceAnnotations }} + annotations: +{{ toYaml .Values.Master.ServiceAnnotations | indent 4}} +{{- end }} spec: ports: - port: {{.Values.Master.ServicePort}} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index aa7657848bb3..cdf178f16e1d 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -20,6 +20,9 @@ Master: # For minikube, set this to NodePort, elsewhere use LoadBalancer # Use ClusterIP if your setup includes ingress controller ServiceType: LoadBalancer +# Master Service annotations + ServiceAnnotations: {} + # service.beta.kubernetes.io/aws-load-balancer-backend-protocol: https # Used to create Ingress record (should used with ServiceType: ClusterIP) # HostName: jenkins.cluster.local # NodePort: