Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-01 06:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/common] fix: wrong use of append function (#3566)

Browse Source 
* [bitnami/common] fix: wrong use of append function

Signed-off-by: darteaga <darteaga@vmware.com>

* fix: indentation

Signed-off-by: darteaga <darteaga@vmware.com>
This commit is contained in:
Daniel Arteaga
2020-09-01 12:52:08 +02:00
committed by GitHub
parent 630bb00113
commit c912fd0b73
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bitnami/common/Chart.yaml
View File

@@ -1,8 +1,8 @@
apiVersion: v1
name: common
# Please make sure that version and appVersion are always the same.
version: 0.6.1
appVersion: 0.6.1
version: 0.6.2
appVersion: 0.6.2
description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself.
keywords:
- common

2
bitnami/common/README.md
View File

@@ -52,7 +52,7 @@ The following table lists the helpers available in the library which are scoped
| Helper identifier | Description | Expected Input |
|--------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `common.images.image` | Return the proper and full image name | `dict "imageRoot" .Values.path.to.the.image "global" $`, see [ImageRoot](#imageroot) for the structure. |
| `common.images.pullSecrets` | Return the proper Docker Image Registry Secret Names | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" $` |
| `common.images.pullSecrets` | Return the proper Docker Image Registry Secret Names | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global` |
**Labels**

37
bitnami/common/templates/_images.tpl
View File

@@ -17,28 +17,27 @@ Return the proper image name
{{/*
Return the proper Docker Image Registry Secret Names
{{ include "common.images.pullSecrets" ( dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" $) }}
{{ include "common.images.pullSecrets" ( dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global) }}
*/}}
{{- define "common.images.pullSecrets" -}}
{{- if .global }}
{{- if .global.imagePullSecrets }}
{{- $pullSecrets := list }}
{{- if .global }}
{{- range .global.imagePullSecrets -}}
{{- $pullSecrets = append $pullSecrets . -}}
{{- end -}}
{{- end -}}
{{- range .images -}}
{{- range .pullSecrets -}}
{{- $pullSecrets = append $pullSecrets . -}}
{{- end -}}
{{- end -}}
{{- if (not (empty $pullSecrets)) }}
imagePullSecrets:
{{- range .global.imagePullSecrets }}
{{- range $pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
{{- end }}
{{- else }}
{{- $pullSecrets := list }}
{{- range .images }}
{{- if .pullSecrets }}
{{- $pullSecrets = append $pullSecrets .pullSecrets }}
{{- end }}
{{- end }}
{{- if $pullSecrets }}
imagePullSecrets:
{{- range $pullSecrets }}
- name: {{ . }}
{{- end }}
{{- end }}
{{- end -}}
{{- end -}}