[stable/gitlab-ce] Update to the recommended pvc patterns. (#444)

* Convert chart gitlab-ce to use the recommended pvc patterns

* Update data-pvc.yaml

* Update etc-pvc.yaml

* Update Chart.yaml

* Update _helpers.tpl

* gitlab-ce: Update requirements

* update postgresql dependency

* gitlab-ce: Update to redis 0.4.3

* gitlab-ce: update requirements.lock for redis

stable/gitlab-ce/requirements.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: redis
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.4.1
+  version: 0.4.3
 - name: postgresql
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.3.0
-digest: sha256:db63d94e04a5324faf7968f783837b90a127cdc75a4b8fd65f2b18c471bac80d
-generated: 2017-01-17T10:21:20.673113068-08:00
+  version: 0.3.2
+digest: sha256:958f4f93f3f03e58a88658a149615f835e20c220a342d701bf2c50183bb084f6
+generated: 2017-01-29T14:28:10.006348717-08:00

stable/gitlab-ce/requirements.yaml

@@ -1,7 +1,7 @@
 dependencies:
 - name: redis
-  version: 0.4.1
+  version: 0.4.3
   repository: https://kubernetes-charts.storage.googleapis.com/
 - name: postgresql
-  version: 0.3.0
+  version: 0.3.2
   repository: https://kubernetes-charts.storage.googleapis.com/

stable/gitlab-ce/templates/_helpers.tpl

@@ -3,30 +3,30 @@
 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 -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified postgresql 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 "postgresql.fullname" -}}
-{{- printf "%s-%s" .Release.Name "postgresql" | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified redis 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 "redis.fullname" -}}
-{{- printf "%s-%s" .Release.Name "redis" | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

stable/gitlab-ce/templates/data-pvc.yaml

@@ -4,7 +4,11 @@ apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-data
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.gitlabData.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.gitlabData.accessMode | quote }}

stable/gitlab-ce/templates/etc-pvc.yaml

@@ -4,7 +4,11 @@ apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-etc
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.gitlabEtc.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.gitlabEtc.accessMode | quote }}

stable/gitlab-ce/values.yaml

@@ -54,7 +54,10 @@ persistence:
   gitlabEtc:
     enabled: true
     size: 1Gi
-    storageClass: generic
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ##
+    # storageClass:
     accessMode: ReadWriteOnce
   ## This volume is used to store git data and other project files.
   ## ref: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
@@ -62,7 +65,10 @@ persistence:
   gitlabData:
     enabled: true
     size: 10Gi
-    storageClass: generic
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ##
+    # storageClass:
     accessMode: ReadWriteOnce
 
 ## Configuration values for the postgresql dependency.