From 4d8bdc3c2917de5d0d29d59e7b1beade7e11975e Mon Sep 17 00:00:00 2001 From: Tomas Pizarro Date: Wed, 4 Apr 2018 13:54:08 +0200 Subject: [PATCH] [stable/testlink] Refactor image property in values.yaml (#4660) * [stable/testlink] Refactor image properties in values.yaml * Use rolling tag and refactor pullSecrets * Fix lint issue * Bump chart version * Update Chart.yaml --- stable/testlink/Chart.yaml | 2 +- stable/testlink/README.md | 7 +++++-- stable/testlink/templates/deployment.yaml | 10 ++++++++-- stable/testlink/values.yaml | 22 +++++++++++++++------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/stable/testlink/Chart.yaml b/stable/testlink/Chart.yaml index ef1e991677..8f42424b39 100644 --- a/stable/testlink/Chart.yaml +++ b/stable/testlink/Chart.yaml @@ -1,5 +1,5 @@ name: testlink -version: 0.5.2 +version: 1.0.0 appVersion: 1.9.16 description: Web-based test management system that facilitates software quality assurance. icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png diff --git a/stable/testlink/README.md b/stable/testlink/README.md index cb232c2a21..9c889e47ed 100644 --- a/stable/testlink/README.md +++ b/stable/testlink/README.md @@ -47,8 +47,11 @@ The following table lists the configurable parameters of the TestLink chart and | Parameter | Description | Default | |-------------------------------------|-----------------------------------------|---------------------------------------------------------| -| `image` | TestLink image | `bitnami/testlink:{VERSION}` | -| `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `image.registry` | TestLink image registry | `docker.io` | +| `image.repository` | TestLink Image name | `bitnami/testlink` | +| `image.tag` | TestLink Image tag | `{VERSION}` | +| `image.pullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `image.pullSecrets` | Specify image pull secrets | `nil` | | `testlinkUsername` | Admin username | `user` | | `testlinkPassword` | Admin user password | _random 10 character long alphanumeric string_ | | `testlinkEmail` | Admin user email | `user@example.com` | diff --git a/stable/testlink/templates/deployment.yaml b/stable/testlink/templates/deployment.yaml index f429981184..e32ee27440 100644 --- a/stable/testlink/templates/deployment.yaml +++ b/stable/testlink/templates/deployment.yaml @@ -14,10 +14,16 @@ spec: labels: app: {{ template "fullname" . }} spec: + {{- if .Values.image.pullSecrets }} + imagePullSecrets: + {{- range .Values.image.pullSecrets }} + - name: {{ . }} + {{- end}} + {{- end }} containers: - name: {{ template "fullname" . }} - image: "{{ .Values.image }}" - imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: ALLOW_EMPTY_PASSWORD value: {{ .Values.allowEmptyPassword | quote }} diff --git a/stable/testlink/values.yaml b/stable/testlink/values.yaml index 11995cc5fd..aaab315a7a 100644 --- a/stable/testlink/values.yaml +++ b/stable/testlink/values.yaml @@ -1,13 +1,21 @@ ## Bitnami TestLink image version ## ref: https://hub.docker.com/r/bitnami/testlink/tags/ ## -image: bitnami/testlink:1.9.16-r11 - -## Specify a imagePullPolicy -## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' -## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images -## -# imagePullPolicy: +image: + registry: docker.io + repository: bitnami/testlink + tag: 1.9.16 + ## Specify a imagePullPolicy + ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' + ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## + # pullSecrets: + # - myRegistrKeySecretName ## Admin username ## ref: https://github.com/bitnami/bitnami-docker-testlink#environment-variables