marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix template issues

Browse Source 
Signed-off-by: Pascal Sthamer <pascal+github@sthamer.xyz>
This commit is contained in:
Pascal Sthamer
2025-12-03 12:56:05 +01:00
parent d63db15c42
commit 43030316e6
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/kubernetes/charts/shuffle/templates/shuffle-app/_helpers.tpl
+6 -6
View File
@@ -89,8 +89,8 @@ Usage:
{{ include "shuffle.appInstance.labels" (dict "app" $app "customLabels" .Values.commonLabels "context" $) }} {{ include "shuffle.appInstance.labels" (dict "app" $app "customLabels" .Values.commonLabels "context" $) }}
*/}} */}}
{{- define "shuffle.appInstance.labels" -}} {{- define "shuffle.appInstance.labels" -}}
{{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-app" "app.kubernetes.io/part-of" "shuffle") $customLabels -}} {{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-app" "app.kubernetes.io/part-of" "shuffle") (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) -}}
{{ include "common.labels.standard" (dict "customLabels" $customLabels "context" $) }} {{ include "common.labels.standard" (dict "customLabels" $customLabels "context" .context) }}
app.shuffler.io/name: {{ include "shuffle.appInstance.name" .app }} app.shuffler.io/name: {{ include "shuffle.appInstance.name" .app }}
app.shuffler.io/version: {{ .app.version | quote }} app.shuffler.io/version: {{ .app.version | quote }}
{{- end -}} {{- end -}}
@@ -101,8 +101,8 @@ Usage:
{{ include "shuffle.appInstance.matchLabels" (dict "app" $app "customLabels" .Values.commonLabels "context" $) }} {{ include "shuffle.appInstance.matchLabels" (dict "app" $app "customLabels" .Values.commonLabels "context" $) }}
*/}} */}}
{{- define "shuffle.appInstance.matchLabels" -}} {{- define "shuffle.appInstance.matchLabels" -}}
{{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-app" "app.kubernetes.io/part-of" "shuffle") $customLabels -}} {{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-app" "app.kubernetes.io/part-of" "shuffle") (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) -}}
{{ include "common.labels.matchLabels" (dict "customLabels" $customLabels "context" $) }} {{ include "common.labels.matchLabels" (dict "customLabels" $customLabels "context" .context) }}
app.shuffler.io/name: {{ include "shuffle.appInstance.name" .app }} app.shuffler.io/name: {{ include "shuffle.appInstance.name" .app }}
app.shuffler.io/version: {{ .app.version | quote }} app.shuffler.io/version: {{ .app.version | quote }}
{{- end -}} {{- end -}}
@@ -113,8 +113,8 @@ Usage:
{{ include "shuffle.appInstance.affinities.pods" (dict "type" "soft" "app" $app "customLabels" $podLabels "context" $) -}} {{ include "shuffle.appInstance.affinities.pods" (dict "type" "soft" "app" $app "customLabels" $podLabels "context" $) -}}
*/}} */}}
{{- define "shuffle.appInstance.affinities.pods" -}} {{- define "shuffle.appInstance.affinities.pods" -}}
{{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-app" "app.kubernetes.io/part-of" "shuffle") .customLabels -}} {{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-app" "app.kubernetes.io/part-of" "shuffle") (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) -}}
{{- $extraMatchLabels := dict "app.shuffler.io/name" (include "shuffle.appInstance.name" .app) "app.shuffler.io/version" (.app.version | quote) }} {{- $extraMatchLabels := dict "app.shuffler.io/name" (include "shuffle.appInstance.name" .app) "app.shuffler.io/version" (.app.version) }}
{{ include "common.affinities.pods" (dict "type" .type "customLabels" $customLabels "context" .context "extraMatchLabels" $extraMatchLabels )}} {{ include "common.affinities.pods" (dict "type" .type "customLabels" $customLabels "context" .context "extraMatchLabels" $extraMatchLabels )}}
{{- end -}} {{- end -}}
functions/kubernetes/charts/shuffle/templates/shuffle-worker/_helpers.tpl
+5 -5
View File
@@ -77,8 +77,8 @@ Usage:
{{ include "shuffle.workerInstance.labels" (dict "customLabels" $podLabels "context" $) -}} {{ include "shuffle.workerInstance.labels" (dict "customLabels" $podLabels "context" $) -}}
*/}} */}}
{{- define "shuffle.workerInstance.labels" -}} {{- define "shuffle.workerInstance.labels" -}}
{{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-worker" "app.kubernetes.io/part-of" "shuffle") $customLabels -}} {{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-worker" "app.kubernetes.io/part-of" "shuffle") (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) -}}
{{ include "common.labels.standard" (dict "customLabels" $customLabels "context" $) }} {{ include "common.labels.standard" (dict "customLabels" $customLabels "context" .context) }}
{{- end -}} {{- end -}}
{{/* {{/*
@@ -87,8 +87,8 @@ Usage:
{{ include "shuffle.workerInstance.matchLabels" (dict "customLabels" $podLabels "context" $) -}} {{ include "shuffle.workerInstance.matchLabels" (dict "customLabels" $podLabels "context" $) -}}
*/}} */}}
{{- define "shuffle.workerInstance.matchLabels" -}} {{- define "shuffle.workerInstance.matchLabels" -}}
{{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-worker" "app.kubernetes.io/part-of" "shuffle") $customLabels -}} {{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-worker" "app.kubernetes.io/part-of" "shuffle") (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) -}}
{{ include "common.labels.matchLabels" (dict "customLabels" $customLabels "context" $) }} {{ include "common.labels.matchLabels" (dict "customLabels" $customLabels "context" .context) }}
{{- end -}} {{- end -}}
{{/* {{/*
@@ -97,7 +97,7 @@ Usage:
{{ include "shuffle.workerInstance.affinities.pods" (dict "type" "soft" "customLabels" $podLabels "context" $) -}} {{ include "shuffle.workerInstance.affinities.pods" (dict "type" "soft" "customLabels" $podLabels "context" $) -}}
*/}} */}}
{{- define "shuffle.workerInstance.affinities.pods" -}} {{- define "shuffle.workerInstance.affinities.pods" -}}
{{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-worker" "app.kubernetes.io/part-of" "shuffle") .customLabels -}} {{- $customLabels := mustMerge (dict "app.kubernetes.io/name" "shuffle-worker" "app.kubernetes.io/part-of" "shuffle") (include "common.tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml) -}}
{{ include "common.affinities.pods" (dict "type" .type "customLabels" $customLabels "context" .context )}} {{ include "common.affinities.pods" (dict "type" .type "customLabels" $customLabels "context" .context )}}
{{- end -}} {{- end -}}
functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-vpa.yaml
-1
View File
@@ -29,7 +29,6 @@ spec:
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment kind: Deployment
name: {{ include "shuffle.worker.name" . }} name: {{ include "shuffle.worker.name" . }}
{{- end }}
{{- if .Values.worker.autoscaling.vpa.updatePolicy }} {{- if .Values.worker.autoscaling.vpa.updatePolicy }}
updatePolicy: updatePolicy:
{{- with .Values.worker.autoscaling.vpa.updatePolicy.updateMode }} {{- with .Values.worker.autoscaling.vpa.updatePolicy.updateMode }}