From 11f64eeea63755331983d6016aa0b3c1e5606fe1 Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Mon, 30 Jan 2017 19:32:25 -0500 Subject: [PATCH] [stable/testlink] Update to the recommended pvc patterns. (#468) * Convert chart testlink to use the recommended pvc patterns * remove annotations and fix trunc in pvc * document alpha storage class fallback * remove annotations and fix trunc in apache pvc * increase truncation to 63 and trim trailing dashes * update mariadb dep and NOTES.txt --- stable/testlink/README.md | 4 ++-- stable/testlink/requirements.lock | 6 +++--- stable/testlink/requirements.yaml | 2 +- stable/testlink/templates/NOTES.txt | 2 +- stable/testlink/templates/_helpers.tpl | 10 +++++----- stable/testlink/templates/apache-pvc.yaml | 6 +++++- stable/testlink/templates/testlink-pvc.yaml | 6 +++++- stable/testlink/values.yaml | 15 ++++++++++++--- 8 files changed, 34 insertions(+), 17 deletions(-) diff --git a/stable/testlink/README.md b/stable/testlink/README.md index b4feccb193..868a8e2f8a 100644 --- a/stable/testlink/README.md +++ b/stable/testlink/README.md @@ -61,10 +61,10 @@ The following tables lists the configurable parameters of the TestLink chart and | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `generic` | +| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `nil` (uses alpha storage class annotation) | | `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | | `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | -| `persistence.testlink.storageClass` | PVC Storage Class for TestLink volume | `generic` | +| `persistence.testlink.storageClass` | PVC Storage Class for TestLink volume | `nil` (uses alpha storage class annotation) | | `persistence.testlink.accessMode` | PVC Access Mode for TestLink volume | `ReadWriteOnce` | | `persistence.testlink.size` | PVC Storage Request for TestLink volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | diff --git a/stable/testlink/requirements.lock b/stable/testlink/requirements.lock index 76975600b7..a34e27cf8c 100644 --- a/stable/testlink/requirements.lock +++ b/stable/testlink/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.5.6 -digest: sha256:1b3aad03b4383d1a24dfbfef6ba1beb45f7ace2baa399c66f5a4d56d0f7bc717 -generated: 2017-01-25T17:06:30.276245527-08:00 + version: 0.5.7 +digest: sha256:409eefb841b53ef1aa91d0607d87e6c475297df40101180c787260d766657d95 +generated: 2017-01-27T16:26:59.945259986-08:00 diff --git a/stable/testlink/requirements.yaml b/stable/testlink/requirements.yaml index 9303bd388a..ac65eec118 100644 --- a/stable/testlink/requirements.yaml +++ b/stable/testlink/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.x + version: 0.5.7 repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/stable/testlink/templates/NOTES.txt b/stable/testlink/templates/NOTES.txt index 480b60d400..7d2239a034 100644 --- a/stable/testlink/templates/NOTES.txt +++ b/stable/testlink/templates/NOTES.txt @@ -24,4 +24,4 @@ 2. Get your TestLink login credentials by running: echo Username: {{ .Values.testlinkUsername }} - echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.testlink-password[*]}"`)) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.testlink-password}" | base64 --decode) diff --git a/stable/testlink/templates/_helpers.tpl b/stable/testlink/templates/_helpers.tpl index 4355810df4..1e52d321ca 100644 --- a/stable/testlink/templates/_helpers.tpl +++ b/stable/testlink/templates/_helpers.tpl @@ -3,22 +3,22 @@ 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 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 "mariadb.fullname" -}} -{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}} +{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/testlink/templates/apache-pvc.yaml b/stable/testlink/templates/apache-pvc.yaml index 39fd689744..166feb8b9f 100644 --- a/stable/testlink/templates/apache-pvc.yaml +++ b/stable/testlink/templates/apache-pvc.yaml @@ -9,7 +9,11 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" annotations: - volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} + {{- if .Values.persistence.apache.storageClass }} + volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} + {{- else }} + volume.alpha.kubernetes.io/storage-class: default + {{- end }} spec: accessModes: - {{ .Values.persistence.apache.accessMode | quote }} diff --git a/stable/testlink/templates/testlink-pvc.yaml b/stable/testlink/templates/testlink-pvc.yaml index a71b272d48..d5fd48b158 100644 --- a/stable/testlink/templates/testlink-pvc.yaml +++ b/stable/testlink/templates/testlink-pvc.yaml @@ -9,7 +9,11 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" annotations: - volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.testlink.storageClass | quote }} + {{- if .Values.persistence.testlink.storageClass }} + volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.testlink.storageClass | quote }} + {{- else }} + volume.alpha.kubernetes.io/storage-class: default + {{- end }} spec: accessModes: - {{ .Values.persistence.testlink.accessMode | quote }} diff --git a/stable/testlink/values.yaml b/stable/testlink/values.yaml index b17bd608f9..c4413a5247 100644 --- a/stable/testlink/values.yaml +++ b/stable/testlink/values.yaml @@ -54,7 +54,10 @@ mariadb: ## persistence: enabled: true - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 8Gi @@ -69,11 +72,17 @@ serviceType: LoadBalancer persistence: enabled: true apache: - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 1Gi testlink: - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 8Gi