add configurable service annotations helm#1234 (helm#1244)

wmcdona89 · Jul 5, 2017 · d66484b · d66484b
1 parent 7733814
commit d66484b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.8.0
+version: 0.8.1
 appVersion: 2.67
 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/charts/jenkins/templates/jenkins-master-svc.yaml b/charts/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/charts/jenkins/values.yaml b/charts/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: <to set explicitly, choose port between 30000-32767