Update value to get from template .fullname

Signed-off-by: Viet Nguyen Duc <[email protected]>
SeleniumHQ · Nov 2, 2023 · 8427e43 · 8427e43
1 parent d14879b
commit 8427e43
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/charts/selenium-grid/templates/chrome-node-deployment.yaml b/charts/selenium-grid/templates/chrome-node-deployment.yaml
@@ -23,8 +23,8 @@ spec:
       app: selenium-chrome-node
       app.kubernetes.io/instance: {{ .Release.Name }}
 {{- $podScope := deepCopy . -}}
-{{- $_ := set $podScope "name" "selenium-chrome-node" -}}
-{{- $_ =  set $podScope "node" .Values.chromeNode  -}}
+{{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" .) -}}
+{{- $_ =  set $podScope "node" .Values.chromeNode -}}
 {{- $_ =  set $podScope "uploader" (get .Values.videoRecorder (.Values.videoRecorder.uploader | toString)) -}}
 {{- include "seleniumGrid.podTemplate" $podScope | nindent 2 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml b/charts/selenium-grid/templates/chrome-node-scaledjobs.yaml
@@ -20,8 +20,8 @@ metadata:
     {{- end }}
 spec:
   {{- $podScope := deepCopy . -}}
-  {{- $_ := set $podScope "name" "selenium-chrome-node" -}}
-  {{- $_ =  set $podScope "node" .Values.chromeNode  -}}
+  {{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" .) -}}
+  {{- $_ =  set $podScope "node" .Values.chromeNode -}}
   {{- $_ =  set $podScope "uploader" (get .Values.videoRecorder (.Values.videoRecorder.uploader | toString)) -}}
   {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) }}
   {{- include "seleniumGrid.autoscalingTemplate" $podScope | nindent 2 }}

diff --git a/charts/selenium-grid/templates/edge-node-deployment.yaml b/charts/selenium-grid/templates/edge-node-deployment.yaml
@@ -23,8 +23,8 @@ spec:
       app: selenium-edge-node
       app.kubernetes.io/instance: {{ .Release.Name }}
 {{- $podScope := deepCopy . -}}
-{{- $_ := set $podScope "name" "selenium-edge-node" -}}
-{{- $_ =  set $podScope "node" .Values.edgeNode  -}}
+{{- $_ := set $podScope "name" (include "seleniumGrid.edgeNode.fullname" .) -}}
+{{- $_ =  set $podScope "node" .Values.edgeNode -}}
 {{- $_ =  set $podScope "uploader" (get .Values.videoRecorder (.Values.videoRecorder.uploader | toString)) -}}
 {{- include "seleniumGrid.podTemplate" $podScope | nindent 2 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/edge-node-scaledjob.yaml b/charts/selenium-grid/templates/edge-node-scaledjob.yaml
@@ -20,8 +20,8 @@ metadata:
     {{- end }}
 spec:
   {{- $podScope := deepCopy . -}}
-  {{- $_ := set $podScope "name" "selenium-edge-node" -}}
-  {{- $_ =  set $podScope "node" .Values.edgeNode  -}}
+  {{- $_ := set $podScope "name" (include "seleniumGrid.edgeNode.fullname" .) -}}
+  {{- $_ =  set $podScope "node" .Values.edgeNode -}}
   {{- $_ =  set $podScope "uploader" (get .Values.videoRecorder (.Values.videoRecorder.uploader | toString)) -}}
   {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) }}
   {{- include "seleniumGrid.autoscalingTemplate" $podScope | nindent 2 }}

diff --git a/charts/selenium-grid/templates/firefox-node-deployment.yaml b/charts/selenium-grid/templates/firefox-node-deployment.yaml
@@ -23,8 +23,8 @@ spec:
       app: selenium-firefox-node
       app.kubernetes.io/instance: {{ .Release.Name }}
 {{- $podScope := deepCopy . -}}
-{{- $_ := set $podScope "name" "selenium-firefox-node" -}}
-{{- $_ =  set $podScope "node" .Values.firefoxNode  -}}
+{{- $_ := set $podScope "name" (include "seleniumGrid.firefoxNode.fullname" .) -}}
+{{- $_ =  set $podScope "node" .Values.firefoxNode -}}
 {{- $_ =  set $podScope "uploader" (get .Values.videoRecorder (.Values.videoRecorder.uploader | toString)) -}}
 {{- include "seleniumGrid.podTemplate" $podScope | nindent 2 }}
 {{- end }}
diff --git a/charts/selenium-grid/templates/firefox-node-scaledjob.yaml b/charts/selenium-grid/templates/firefox-node-scaledjob.yaml
@@ -20,8 +20,8 @@ metadata:
     {{- end }}
 spec:
   {{- $podScope := deepCopy . -}}
-  {{- $_ := set $podScope "name" "selenium-firefox-node" -}}
-  {{- $_ =  set $podScope "node" .Values.firefoxNode  -}}
+  {{- $_ := set $podScope "name" (include "seleniumGrid.firefoxNode.fullname" .) -}}
+  {{- $_ =  set $podScope "node" .Values.firefoxNode -}}
   {{- $_ =  set $podScope "uploader" (get .Values.videoRecorder (.Values.videoRecorder.uploader | toString)) -}}
   {{- $_ =  set $podScope "podTemplate" (include "seleniumGrid.podTemplate" $podScope | fromYaml) }}
   {{- include "seleniumGrid.autoscalingTemplate" $podScope | nindent 2 }}