Skip to content

Corrections to rendering templatized values into partial plus ignore generated pull secrets #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sabre1041 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −9
Open

Corrections to rendering templatized values into partial plus ignore generated pull secrets #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/qtodo/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Create the image path for the passed in image field
*/}}
{{- define "qtodo.image" -}}
{{- if eq (substr 0 7 .version) "sha256:" -}}
{{- printf "%s@%s" (tpl .name .) (tpl .version .) -}}
{{- if eq (substr 0 7 (tpl .value.version .context)) "sha256:" -}}
{{- printf "%s@%s" (tpl .value.name .context) (tpl .value.version .context) -}}
{{- else -}}
{{- printf "%s:%s" (tpl .name .) (tpl .version .) -}}
{{- printf "%s:%s" (tpl .value.name .context) (tpl .value.version .context) -}}
{{- end -}}
{{- end -}}
10 changes: 5 additions & 5 deletions charts/qtodo/templates/app-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
mountPath: /etc/pki/ca-trust/extracted/pem
readOnly: true
- name: init-spiffe-helper
image: {{ template "qtodo.image" .Values.app.images.spiffeHelper }}
image: {{ template "qtodo.image" (dict "value" .Values.app.images.spiffeHelper "context" $) }}
imagePullPolicy: {{ .Values.app.images.spiffeHelper.pullPolicy }}
args:
- '-config'
Expand All @@ -105,7 +105,7 @@ spec:
- name: svids
mountPath: /svids
- name: init-spiffe-vault-client
image: {{ template "qtodo.image" .Values.app.images.spiffeVaultClient }}
image: {{ template "qtodo.image" (dict "value" .Values.app.images.spiffeVaultClient "context" $) }}
imagePullPolicy: {{ .Values.app.images.spiffeVaultClient.pullPolicy }}
command:
- python3
Expand Down Expand Up @@ -140,7 +140,7 @@ spec:
containers:
{{- if and .Values.app.spire.enabled .Values.app.spire.sidecars }}
- name: spiffe-helper
image: {{ template "qtodo.image" .Values.app.images.spiffeHelper }}
image: {{ template "qtodo.image" (dict "value" .Values.app.images.spiffeHelper "context" $) }}
imagePullPolicy: {{ .Values.app.images.spiffeHelper.pullPolicy }}
args:
- '-config'
Expand All @@ -157,7 +157,7 @@ spec:
- name: svids
mountPath: /svids
- name: spiffe-vault-client
image: {{ template "qtodo.image" .Values.app.images.spiffeVaultClient }}
image: {{ template "qtodo.image" (dict "value" .Values.app.images.spiffeVaultClient "context" $) }}
imagePullPolicy: {{ .Values.app.images.spiffeVaultClient.pullPolicy }}
command:
- python3
Expand Down Expand Up @@ -193,7 +193,7 @@ spec:
readOnly: true
{{- end }}
- name: qtodo
image: {{ template "qtodo.image" .Values.app.images.main }}
image: {{ template "qtodo.image" (dict "value" .Values.app.images.main "context" $) }}
imagePullPolicy: {{ .Values.app.images.main.pullPolicy }}
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion charts/qtodo/templates/postgresql-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: postgres
image: {{ template "qtodo.image" .Values.app.images.postgresql }}
image: {{ template "qtodo.image" (dict "value" .Values.app.images.postgresql "context" $) }}
imagePullPolicy: IfNotPresent
env:
- name: POSTGRESQL_DATABASE
Expand Down
5 changes: 5 additions & 0 deletions values-hub.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,11 @@ clusterGroup:
namespace: qtodo
project: hub
path: charts/qtodo
ignoreDifferences:
- group: ""
kind: ServiceAccount
jqPathExpressions:
- .imagePullSecrets[]|select(.name | contains("-dockercfg-"))
overrides:
- name: app.oidc.enabled
value: true
Expand Down