From 93ed815317c219dd4dd047e7f80f55b866951fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfred=20G=C3=B6ppel?= <43101280+alfi0812@users.noreply.github.com> Date: Thu, 27 Mar 2025 10:03:30 +0100 Subject: [PATCH] fix(spegel): patch tpl (#33644) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code - [ ] 📜 Documentation Changes **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made changes to the documentation - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning - [x] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or `fix(docs):` **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Alfred Göppel <43101280+alfi0812@users.noreply.github.com> --- charts/system/spegel/Chart.yaml | 2 +- charts/system/spegel/templates/_args.tpl | 12 ++++++------ charts/system/spegel/values.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/system/spegel/Chart.yaml b/charts/system/spegel/Chart.yaml index 200d381dbac..ad63d67effa 100644 --- a/charts/system/spegel/Chart.yaml +++ b/charts/system/spegel/Chart.yaml @@ -31,4 +31,4 @@ sources: - https://ghcr.io/spegel-org/spegel - https://github.com/truecharts/charts/tree/master/charts/system/spegel type: application -version: 3.2.1 +version: 3.2.2 diff --git a/charts/system/spegel/templates/_args.tpl b/charts/system/spegel/templates/_args.tpl index c2100797360..3d6162231b9 100644 --- a/charts/system/spegel/templates/_args.tpl +++ b/charts/system/spegel/templates/_args.tpl @@ -4,22 +4,22 @@ - configuration - --log-level={{ .Values.spegel.logLevel }} - --containerd-registry-config-path={{ .Values.spegel.containerdRegistryConfigPath }} - {{- with .Values.spegel.registries }} - - --registries + {{- with .Values.spegel.mirroredRegistries }} + - --mirrored-registries {{- range . }} - {{ . | quote }} {{- end }} {{- end }} - - --mirror-registries + - --mirror-targets - http://$(NODE_IP):{{ .Values.service.main.ports.main.hostPort }} - http://$(NODE_IP):{{ .Values.service.main.ports.main.nodePort }} - {{- with .Values.spegel.additionalMirrorRegistries }} + {{- with .Values.spegel.additionalMirrorTargets }} {{- range . }} - {{ . | quote }} {{- end }} {{- end }} - --resolve-tags={{ .Values.spegel.resolveTags }} - - --append-mirrors={{ .Values.spegel.appendMirrors }} + - --prepend-existing={{ .Values.spegel.prependExisting }} {{- end -}} {{- define "spegel.args.main" -}} args: @@ -31,7 +31,7 @@ - --router-addr=:{{ .Values.service.router.ports.router.port }} - --metrics-addr=:{{ .Values.service.metrics.ports.metrics.port}} {{- with .Values.spegel.registries }} - - --registries + - --mirrored-registries {{- range . }} - {{ . | quote }} {{- end }} diff --git a/charts/system/spegel/values.yaml b/charts/system/spegel/values.yaml index 91e58c7a2ce..9dd84c66894 100644 --- a/charts/system/spegel/values.yaml +++ b/charts/system/spegel/values.yaml @@ -161,7 +161,7 @@ spegel: # -- When true latest tags will be resolved to digests. resolveLatestTag: true # -- When true existing mirror configuration will be appended to instead of replaced. - appendMirrors: true + prependExisting: true # -- The service account the pods will use to interact with the Kubernetes API serviceAccount: