From e664f6571e06793e44bd23e1c4b72fe3992a5fc8 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer Date: Fri, 5 Dec 2025 16:35:17 +0100 Subject: [PATCH] fix app services and images Signed-off-by: Pascal Sthamer --- .../charts/shuffle/templates/shuffle-app/shuffle-apps.yaml | 5 +++-- functions/kubernetes/charts/shuffle/values.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-apps.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-apps.yaml index e15ae74b..975dd8f8 100644 --- a/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-apps.yaml +++ b/functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-apps.yaml @@ -4,7 +4,7 @@ {{- if and (not ($ignoredKeys | has $key)) $app.enabled }} {{/* Merge .Values.app into $app, giving precedence to the values defined on the app. */}} -{{- $appValues := mustMerge $app $.Values.app -}} +{{- $appValues := mustDeepCopy (mustMerge $app $.Values.app) -}} {{/* use shuffle.appRegistry as default image registry */}} {{- $_ := set $appValues.image "registry" ($appValues.image.registry | default $.Values.shuffle.appRegistry) -}} @@ -31,6 +31,8 @@ spec: targetPort: {{ $.Values.app.exposedContainerPort }} protocol: TCP appProtocol: http + {{- $podLabels := include "common.tplvalues.merge" (dict "values" (list $appValues.podLabels $.Values.commonLabels) "context" $) }} + selector: {{- include "shuffle.appInstance.matchLabels" ( dict "app" $app "customLabels" $podLabels "context" $ ) | nindent 6 }} --- apiVersion: {{ include "common.capabilities.deployment.apiVersion" $ }} kind: Deployment @@ -49,7 +51,6 @@ spec: {{- if $appValues.updateStrategy }} strategy: {{- toYaml $appValues.updateStrategy | nindent 4 }} {{- end }} - {{- $podLabels := include "common.tplvalues.merge" (dict "values" (list $appValues.podLabels $.Values.commonLabels) "context" $) }} selector: matchLabels: {{- include "shuffle.appInstance.matchLabels" ( dict "app" $app "customLabels" $podLabels "context" $ ) | nindent 6 }} template: diff --git a/functions/kubernetes/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml index 27aeca90..a24d9708 100644 --- a/functions/kubernetes/charts/shuffle/values.yaml +++ b/functions/kubernetes/charts/shuffle/values.yaml @@ -2162,7 +2162,7 @@ apps: ## version: 1.2.0 - shuffleSubflow: + shuffleSubflow: ## @param apps.shuffleSubflow.enabled Whether the shuffle-subflow app is enabled ## enabled: true @@ -2183,7 +2183,7 @@ apps: ## @param apps.http.version The version of the http app to deploy. ## version: 1.4.0 - + # replicas, image, etc. ## @extra apps.MY_APP.app [string] The name of the app (required, e.g. shuffle-tools)