Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/jenkins] Update to the recommended pvc patterns. #448

Merged
merged 5 commits into from
Jan 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/jenkins/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: jenkins
home: https://jenkins.io/
version: 0.1.7
version: 0.1.8
description: A Jenkins Helm chart for Kubernetes.
sources:
- https://github.com/jenkinsci/jenkins
Expand Down
3 changes: 1 addition & 2 deletions stable/jenkins/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1. Get your '{{ .Values.Master.AdminUser }}' user password by running:
printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.jenkins-admin-password[*]}"`);echo
printf $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.jenkins-admin-password}" | base64 --decode);echo

2. Get the Jenkins URL to visit by running these commands in the same shell:
{{- if contains "NodePort" .Values.Master.ServiceType }}
Expand Down Expand Up @@ -32,4 +32,3 @@ https://cloud.google.com/solutions/jenkins-on-container-engine
###### the Jenkins pod is terminated. #####
#################################################################################
{{- end }}

8 changes: 4 additions & 4 deletions stable/jenkins/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Create a default fully qualified app name.
We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
{{- end -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
6 changes: 5 additions & 1 deletion stable/jenkins/templates/home-pvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
annotations:
volume.alpha.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass | quote }}
{{- if .Values.Persistence.StorageClass }}
volume.beta.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass }}
{{- else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
spec:
accessModes:
- {{ .Values.Persistence.AccessMode | quote }}
Expand Down