Commit cbf47d34 authored by Sandro Mathys's avatar Sandro Mathys
Browse files

improve tests image handling

parent 5b2a211d
......@@ -4,7 +4,8 @@ image:
pullPolicy: Always
imagePullSecrets:
- name: maps-shibboleth-sp-helm-chart-registry
# personal(!) access token with read AND write privileges to the registry in order to use the dependency proxy
- name: shibboleth-sp-dependency-proxy
route:
enabled: true
......@@ -46,11 +47,6 @@ frontend:
tests:
enabled: true
imagePullSecrets:
# personal(!) access token with read AND write privileges to the registry in order to use the dependency proxy
- name: shibboleth-sp-dependency-proxy
image:
repository: "gitlab.switch.ch/helm-charts/shibboleth-sp/dependency_proxy/containers/curlimages/curl"
tag: "latest"
pullPolicy: "Always"
......@@ -152,7 +152,7 @@ Create the names of the images and pull policies to use
{{- printf "%s:%s" .Values.tests.image.repository .Values.tests.image.tag }}
{{- end }}
{{- define "shibboleth-sp.tests.imagePullPolicy" -}}
{{- .Values.tests.image.pullPolicy }}
{{- .Values.tests.image.pullPolicy | default .Values.image.pullPolicy }}
{{- end }}
{{/*
......
......@@ -7,9 +7,9 @@ metadata:
annotations:
"helm.sh/hook": test
spec:
{{- if .Values.tests.imagePullSecrets }}
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
{{- with .Values.tests.imagePullSecrets }}
{{- with .Values.imagePullSecrets }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
......
......@@ -326,11 +326,8 @@ frontend:
tests:
enabled: false
# imagePullSecrets:
# - name:
# requires sh, echo, cat, curl, grep in the path of the image
image:
repository: "docker.io/curlimages/curl"
tag: "latest"
pullPolicy: "IfNotPresent"
image: {}
# repository: "docker.io/curlimages/curl"
# tag: "latest"
# pullPolicy: "IfNotPresent"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment