Merge branch 'main' into fix/custom-chart-deploy

Author: Ash-exp

scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml

@@ -209,7 +209,7 @@ spec:
 {{- end}}
 {{- end}}
       containers:
-        - name: {{ $.Chart.Name }}
+        - name: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
           image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           {{- if $.Values.containerSpec.lifecycle.enabled }}
@@ -825,7 +825,7 @@ spec:
 {{- end}}
 {{- end}}
       containers:
-        - name: {{ $.Chart.Name }}
+        - name: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
           image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           {{- if $.Values.containerSpec.lifecycle.enabled }}

scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml

@@ -43,7 +43,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: cpu
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetCPUUtilizationPercentage }}
@@ -52,7 +52,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: memory
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetMemoryUtilizationPercentage }}
@@ -126,7 +126,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: cpu
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetCPUUtilizationPercentage }}
@@ -135,7 +135,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: memory
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetMemoryUtilizationPercentage }}

scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/values.yaml

@@ -38,6 +38,10 @@ pauseForSecondsBeforeSwitchActive: 30
 waitForSecondsBeforeScalingDown: 30
 autoPromotionSeconds: 30
 
+# Optional override for the main container name. If provided, this name will be used
+# for the primary container instead of the default chart-derived name.
+containerName: ""
+
 Spec:
  Affinity:
   Key: ""
@@ -704,6 +708,8 @@ customPodLabels: {}
 
 secondaryWorkload:
   enabled: false
+  # Optional override for secondary workload's main container name
+  containerName: ""
   Spec:
     Affinity:
       Key: ""

scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/deployment.yaml

@@ -227,7 +227,7 @@ spec:
 {{- end}}
 {{- end}}
       containers:
-        - name: {{ $.Chart.Name }}
+        - name: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
           image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           {{- if $.Values.containerSpec.lifecycle.enabled }}

scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/hpa.yaml

@@ -43,7 +43,7 @@ spec:
   - type: ContainerResource
     containerResource:
       name: cpu
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetCPUUtilizationPercentage }}
@@ -52,7 +52,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: memory
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetMemoryUtilizationPercentage }}

scripts/devtron-reference-helm-charts/reference-chart_5-1-0/values.yaml

@@ -37,6 +37,10 @@ pauseForSecondsBeforeSwitchActive: 30
 waitForSecondsBeforeScalingDown: 30
 autoPromotionSeconds: 30
 
+# Optional override for the main container name. If provided, this name will be used
+# for the primary container instead of the default chart-derived name.
+containerName: ""
+
 Spec:
  Affinity:
   Key:

scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/hpa.yaml

@@ -44,7 +44,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: cpu
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetCPUUtilizationPercentage }}
@@ -53,7 +53,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: memory
-      container: {{ $.Chart.Name }}
+      container: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
       target:
         type: Utilization
         averageUtilization: {{ .TargetMemoryUtilizationPercentage }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/statefulset.yaml

@@ -220,7 +220,7 @@ spec:
 {{- end}}
 {{- end}}
       containers:
-        - name: {{ $.Chart.Name }}
+        - name: "{{ if $.Values.containerName }}{{ $.Values.containerName }}{{ else }}{{ $.Chart.Name }}{{ end }}"
           image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           {{- if $.Values.containerSpec.lifecycle.enabled }}

scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/values.yaml

@@ -36,6 +36,10 @@ pauseForSecondsBeforeSwitchActive: 30
 waitForSecondsBeforeScalingDown: 30
 autoPromotionSeconds: 30
 
+# Optional override for the main container name. If provided, this name will be used
+# for the primary container instead of the default chart-derived name.
+containerName: ""
+
 Spec:
  Affinity:
   Key: