Skip to content
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

Define rootless/non-rootless image tags separately #246

Merged
merged 1 commit into from
Oct 30, 2024
Merged

Define rootless/non-rootless image tags separately #246

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
12 changes: 5 additions & 7 deletions deployments/helm/hephaestus/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Return the controller service account name.
Returns a unified list of image pull secrets.
*/}}
{{- define "hephaestus.imagePullSecrets" -}}
{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.controller.manager.image .Values.controller.vector.image .Values.buildkit.image) "context" $) }}
{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.controller.manager.image .Values.controller.vector.image .Values.buildkit.image .Values.buildkit.rootlessImage) "context" $) }}
{{- end }}

{{/*
Expand Down Expand Up @@ -189,13 +189,11 @@ Return the buildkit mtls server secret name.
Return the buildkit image name.
*/}}
{{- define "hephaestus.buildkit.image" -}}
{{- $imageRoot := .Values.buildkit.image }}
{{- $tag := .Values.buildkit.image.tag | default .Chart.AppVersion }}
{{- if not .Values.buildkit.rootless }}
{{- $tag = replace "-rootless" "" $tag }}
{{- if .Values.buildkit.rootless }}
{{- include "common.images.image" (dict "imageRoot" .Values.buildkit.rootlessImage "global" $) }}
{{- else }}
{{- include "common.images.image" (dict "imageRoot" .Values.buildkit.image "global" $) }}
{{- end }}
{{- $_ := set $imageRoot "tag" $tag }}
{{- include "common.images.image" (dict "imageRoot" $imageRoot "global" $) }}
{{- end }}

{{/*
Expand Down
8 changes: 8 additions & 0 deletions deployments/helm/hephaestus/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,14 @@ buildkit:

# Buildkit image
image:
registry: ""
repository: moby/buildkit
tag: v0.16.0
pullPolicy: IfNotPresent
pullSecrets: []

# Buildkit image
rootlessImage:
registry: ""
repository: moby/buildkit
tag: v0.16.0-rootless
Expand Down