Skip to content

fix(image-pull-secrets): use bitnami common helpers for image pull secrets #191

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
ChocPanda wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(image-pull-secrets): use bitnami common helpers for image pull secrets #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2de6494
Bump helm/kind-action from 1.3.0 to 1.4.0 (#190)
dependabot[bot] Sep 26, 2022
2408308
fix(image-pull-secrets): use bitnami common helpers for image pull se…
Sep 27, 2022
066bc4c
Merge branch 'master' into fix/183/image-pull-secrets
Oct 10, 2022
a99caa5
Merge branch 'master' into fix/183/image-pull-secrets
Oct 26, 2022
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
8 changes: 8 additions & 0 deletions charts/dependency-track/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
{{- include "common.images.image" ( dict "imageRoot" .Values.frontend.image "global" .Values.global ) -}}
{{- end -}}

{{- define "apiserver.image.pullSecrets" -}}
{{- include "common.images.renderPullSecrets" ( dict "images" ( list .Values.apiserver.image ) "context" $ ) -}}
{{- end -}}

{{- define "frontend.image.pullSecrets" -}}
{{- include "common.images.renderPullSecrets" ( dict "images" ( list .Values.frontend.image ) "context" $ ) -}}
{{- end -}}

{{- define "frontend.labels.standard" -}}
{{ include "common.labels.standard" . }}
app.kubernetes.io/component: frontend
Expand Down
4 changes: 1 addition & 3 deletions charts/dependency-track/templates/backend/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ spec:
metadata:
labels: {{- include "backend.labels.standard" . | nindent 8 }}
spec:
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 6 }}
{{- end }}
{{ include "frontend.image.pullSecrets" . | nindent 6 }}
serviceAccountName: {{ include "common.names.fullname" . }}-apiserver
securityContext: {{- toYaml .Values.apiserver.podSecurityContext | nindent 8 }}
{{- with .Values.apiserver.initContainers }}
Expand Down
4 changes: 1 addition & 3 deletions charts/dependency-track/templates/frontend/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ spec:
metadata:
labels: {{- include "frontend.labels.standard" . | nindent 8 }}
spec:
{{- with .Values.global.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 6 }}
{{- end }}
{{- include "frontend.image.pullSecrets" . | nindent 6 }}
serviceAccountName: {{ include "common.names.fullname" . }}-frontend
securityContext: {{- toYaml .Values.frontend.podSecurityContext | nindent 8 }}
containers:
Expand Down
6 changes: 5 additions & 1 deletion charts/dependency-track/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
global:
imageRegistry: docker.io
# imagePullSecrets:
# - name: "myRegistryKeySecretName"
# - "myRegistryKeySecretName"

# -- config of the frontend
frontend:
Expand All @@ -17,6 +17,8 @@ frontend:
repository: dependencytrack/frontend
tag: 4.6.1
pullPolicy: IfNotPresent
pullSecrets: []
# - "myRegistryKeySecretName"
# https://github.com/DependencyTrack/frontend/issues/60
# configmap:
# config: |
Expand Down Expand Up @@ -95,6 +97,8 @@ apiserver:
repository: dependencytrack/apiserver
tag: 4.6.2
pullPolicy: IfNotPresent
pullSecrets: []
# - "myRegistryKeySecretName"
env: []
persistentVolume:
accessModes:
Expand Down