chart: protect resources naming against .Release.Nam contains dots. f…

…rom ArgoCD Signed-off-by: Viet Nguyen Duc <[email protected]>
NDViet · Sep 17, 2024 · d411998 · d411998
1 parent 8126a9b
commit d411998
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/charts/selenium-grid/templates/_nameHelpers.tpl b/charts/selenium-grid/templates/_nameHelpers.tpl
@@ -52,7 +52,7 @@ component.autoscaling: "{{ .Release.Name }}"
 {{- if eq $root.Release.Name "selenium" }}
 {{- $component | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" $root.Release.Name $component | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" $root.Release.Name $component | replace "." "" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 
@@ -74,7 +74,7 @@ Event bus fullname
 Event bus ConfigMap fullname
 */}}
 {{- define "seleniumGrid.eventBus.configmap.fullname" -}}
-{{- tpl (default (include "seleniumGrid.eventBus.fullname" $) .Values.busConfigMap.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
+{{- tpl (default (include "seleniumGrid.component.name" (list "selenium-event-bus-config" $)) .Values.busConfigMap.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -207,7 +207,7 @@ Server ConfigMap fullname
 Patch scaledObjects finalizers job fullname
 */}}
 {{- define "seleniumGrid.keda.patchObjectsJob.fullname" -}}
-{{- tpl (include "seleniumGrid.component.name" (list "selenium-patch-scaledobjects-finalizers" $)) $ | trunc 63 | trimSuffix "-" -}}
+{{- tpl ( default (include "seleniumGrid.component.name" (list "selenium-patch-scaledobjects-finalizers" $)) .Values.autoscaling.patchObjectFinalizers.nameOverride) $ | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*

diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
@@ -785,6 +785,8 @@ autoscaling:
     "helm.sh/hook": post-install,post-upgrade,post-rollback
     "helm.sh/hook-weight": "1"
   patchObjectFinalizers:
+    # -- Override the name of the patch job
+    nameOverride:
     # -- Enable patching finalizers for KEDA scaled resources. Workaround for Hook post-upgrade selenium-grid/templates/x-node-hpa.yaml failed: object is being deleted: scaledobjects.keda.sh "x" already exists
     enabled: true
     # -- Deadline (in seconds) for patch job to complete