From e1bde6872d979dc3eff36d45f5b0e7eee161406c Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Mon, 30 Jan 2017 19:00:43 -0500 Subject: [PATCH] [stable/owncloud] Update to the recommended pvc patterns. (#458) * Convert chart owncloud to use the recommended pvc patterns * fix notes for 1.5 * update mariadb dep * update comments in helpers * bump version --- stable/owncloud/Chart.yaml | 2 +- stable/owncloud/README.md | 1 + stable/owncloud/requirements.lock | 6 +++--- stable/owncloud/requirements.yaml | 2 +- stable/owncloud/templates/NOTES.txt | 2 +- stable/owncloud/templates/_helpers.tpl | 4 ++-- stable/owncloud/values.yaml | 6 +++--- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/stable/owncloud/Chart.yaml b/stable/owncloud/Chart.yaml index 8805f73c9b..58dddc4850 100644 --- a/stable/owncloud/Chart.yaml +++ b/stable/owncloud/Chart.yaml @@ -1,5 +1,5 @@ name: owncloud -version: 0.4.2 +version: 0.4.3 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: - owncloud diff --git a/stable/owncloud/README.md b/stable/owncloud/README.md index e284b61a61..623f02227e 100644 --- a/stable/owncloud/README.md +++ b/stable/owncloud/README.md @@ -65,6 +65,7 @@ The following tables lists the configurable parameters of the ownCloud chart and | `persistence.owncloud.size` | PVC Storage Request for ownCloud volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | + The above parameters map to the env variables defined in [bitnami/owncloud](http://github.com/bitnami/bitnami-docker-owncloud). For more information please refer to the [bitnami/owncloud](http://github.com/bitnami/bitnami-docker-owncloud) image documentation. > **Note**: diff --git a/stable/owncloud/requirements.lock b/stable/owncloud/requirements.lock index 54c7f58a5e..3170838261 100644 --- a/stable/owncloud/requirements.lock +++ b/stable/owncloud/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-17T11:16:51.645003361+05:30 + version: 0.5.7 +digest: sha256:409eefb841b53ef1aa91d0607d87e6c475297df40101180c787260d766657d95 +generated: 2017-01-27T18:09:43.854355049-08:00 diff --git a/stable/owncloud/requirements.yaml b/stable/owncloud/requirements.yaml index 9303bd388a..ac65eec118 100644 --- a/stable/owncloud/requirements.yaml +++ b/stable/owncloud/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/owncloud/templates/NOTES.txt b/stable/owncloud/templates/NOTES.txt index d3614e4869..058777eded 100644 --- a/stable/owncloud/templates/NOTES.txt +++ b/stable/owncloud/templates/NOTES.txt @@ -41,5 +41,5 @@ host. To configure ownCloud with the URL of your service: 2. Get your ownCloud login credentials by running: echo Email: {{ .Values.owncloudUsername }} - echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.owncloud-password[*]}"`)) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.owncloud-password}" | base64 --decode) {{- end }} diff --git a/stable/owncloud/templates/_helpers.tpl b/stable/owncloud/templates/_helpers.tpl index ec19607df6..2463906531 100644 --- a/stable/owncloud/templates/_helpers.tpl +++ b/stable/owncloud/templates/_helpers.tpl @@ -8,7 +8,7 @@ Expand the name of the chart. {{/* 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 -}} @@ -17,7 +17,7 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this {{/* 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 63 | trimSuffix "-" -}} diff --git a/stable/owncloud/values.yaml b/stable/owncloud/values.yaml index ec9dbf45bf..0b6b0c0644 100644 --- a/stable/owncloud/values.yaml +++ b/stable/owncloud/values.yaml @@ -51,7 +51,7 @@ mariadb: ## If defined, volume.beta.kubernetes.io/storage-class: ## Default: volume.alpha.kubernetes.io/storage-class: default ## - # storageClass: generic + # storageClass: accessMode: ReadWriteOnce size: 8Gi @@ -69,14 +69,14 @@ persistence: ## If defined, volume.beta.kubernetes.io/storage-class: ## Default: volume.alpha.kubernetes.io/storage-class: default ## - # storageClass: generic + # storageClass: accessMode: ReadWriteOnce size: 1Gi owncloud: ## If defined, volume.beta.kubernetes.io/storage-class: ## Default: volume.alpha.kubernetes.io/storage-class: default ## - # storageClass: generic + # storageClass: accessMode: ReadWriteOnce size: 8Gi