github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-22 05:48:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/owncloud] Add global registry option (#8455)

Browse Source 
* [stable/owncloud] Add global registry option

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>

* Update deps

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2018-10-16 01:45:08 -07:00
committed by k8s-ci-robot
parent b644c9688e
commit 3909fc68f3
6 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/owncloud/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: owncloud
version: 3.1.0
version: 3.2.0
appVersion: 10.0.10
description: A file sharing server that puts the control and security of your own data back into your hands.
keywords:
stable/owncloud/README.md
+1
View File
@@ -49,6 +49,7 @@ The following table lists the configurable parameters of the ownCloud chart and
| Parameter | Description | Default |
|-------------------------------------|--------------------------------------------|-------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `image.registry` | ownCloud image registry | `docker.io` |
| `image.repository` | ownCloud Image name | `bitnami/owncloud` |
| `image.tag` | ownCloud Image tag | `{VERSION}` |
stable/owncloud/requirements.lock
+2 -2
View File
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 5.0.4
version: 5.2.0
digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c
generated: 2018-09-25T11:49:59.281075519+02:00
generated: 2018-10-16T08:49:42.965735+02:00
stable/owncloud/templates/_helpers.tpl
+24 -1
View File
@@ -49,4 +49,27 @@ Create chart name and version as used by the chart label.
*/}}
{{- define "owncloud.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{/*
Return the proper Owncloud image name
*/}}
{{- define "owncloud.image" -}}
{{- $registryName := .Values.image.registry -}}
{{- $repositoryName := .Values.image.repository -}}
{{- $tag := .Values.image.tag | toString -}}
{{/*
Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- if .Values.global }}
{{- if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- else -}}
{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
{{- end -}}
{{- end -}}
stable/owncloud/templates/deployment.yaml
+1 -1
View File
@@ -29,7 +29,7 @@ spec:
{{- end }}
containers:
- name: {{ template "owncloud.fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: {{ template "owncloud.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: ALLOW_EMPTY_PASSWORD
stable/owncloud/values.yaml
+8
View File
@@ -1,3 +1,9 @@
## Global Docker image registry
## Please, note that this will override the image registry for all the images, including dependencies, configured to use the global value
##
# global:
# imageRegistry:
## Bitnami ownCloud image version
## ref: https://hub.docker.com/r/bitnami/owncloud/tags/
##
@@ -119,6 +125,8 @@ externalDatabase:
##
## MariaDB chart configuration
##
## https://github.com/helm/charts/blob/master/stable/mariadb/values.yaml
##
mariadb:
## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters
enabled: true