From 92b803562f18c65a55c8e9f7b6c961daef6726f8 Mon Sep 17 00:00:00 2001 From: Kiran Yadav Date: Fri, 21 Nov 2025 16:06:36 +0530 Subject: [PATCH 1/2] added namesapce for vs and dr --- .../templates/istio-destinationrule.yaml | 3 +++ .../templates/istio-virtualservice.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-destinationrule.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-destinationrule.yaml index 4d06deb0b8..6fe9ae01c6 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-destinationrule.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-destinationrule.yaml @@ -8,6 +8,9 @@ metadata: {{- else }} name: {{ template ".Chart.Name .fullname" $ }}-destinationrule {{- end }} + {{- if .destinationRule.namespace }} + namespace: {{ .destinationRule.namespace }} + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} appId: {{ $.Values.app | quote }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-virtualservice.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-virtualservice.yaml index 32a3380228..61a7679824 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-virtualservice.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/istio-virtualservice.yaml @@ -8,6 +8,9 @@ metadata: {{- else }} name: {{ template ".Chart.Name .fullname" $ }}-virtualservice {{- end }} + {{- if .virtualService.namespace }} + namespace: {{ .virtualService.namespace }} + {{- end }} labels: app: {{ template ".Chart.Name .name" $ }} appId: {{ $.Values.app | quote }} From 7014ca937d074452dcab68fd7bfa5f5dd8a579b1 Mon Sep 17 00:00:00 2001 From: Kiran Yadav Date: Wed, 3 Dec 2025 16:47:15 +0530 Subject: [PATCH 2/2] Changed container name in case of nameOverride --- .../templates/deployment.yaml | 12 ++++++------ .../deployment-chart_4-21-0/templates/hpa.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml index 1ac0dd96a4..d796578129 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml @@ -179,7 +179,7 @@ spec: initContainers: {{- range $i, $c := .Values.initContainers }} {{- if .reuseContainerImage}} - - name: {{ $.Chart.Name }}-init-{{ add1 $i }} + - name: {{ template ".Chart.Name .name" $ }}-init-{{ add1 $i }} image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} {{- if .securityContext }} @@ -209,7 +209,7 @@ spec: {{- end}} {{- end}} containers: - - name: {{ $.Chart.Name }} + - name: {{ template ".Chart.Name .name" $ }} image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} {{- if $.Values.containerSpec.lifecycle.enabled }} @@ -540,7 +540,7 @@ spec: {{- if $.Values.containers }} {{- range $i, $c := .Values.containers }} {{- if .reuseContainerImage}} - - name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }} + - name: {{ template ".Chart.Name .name" $ }}-sidecontainer-{{ add1 $i }} image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} {{- if .env }} @@ -795,7 +795,7 @@ spec: initContainers: {{- range $i, $c := .Values.initContainers }} {{- if .reuseContainerImage}} - - name: {{ $.Chart.Name }}-init-{{ add1 $i }} + - name: {{ template ".Chart.Name .name" $ }}-init-{{ add1 $i }} image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} {{- if .securityContext }} @@ -825,7 +825,7 @@ spec: {{- end}} {{- end}} containers: - - name: {{ $.Chart.Name }} + - name: {{ template ".Chart.Name .name" $ }} image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} {{- if $.Values.containerSpec.lifecycle.enabled }} @@ -1156,7 +1156,7 @@ spec: {{- if $.Values.containers }} {{- range $i, $c := .Values.containers }} {{- if .reuseContainerImage}} - - name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }} + - name: {{ template ".Chart.Name .name" $ }}-sidecontainer-{{ add1 $i }} image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}" imagePullPolicy: {{ $.Values.image.pullPolicy }} {{- if .env }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml index fd7c7e3f60..3ca57d526a 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml +++ b/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: {{ template ".Chart.Name .name" $ }} target: type: Utilization averageUtilization: {{ .TargetCPUUtilizationPercentage }} @@ -52,7 +52,7 @@ spec: - type: ContainerResource containerResource: name: memory - container: {{ $.Chart.Name }} + container: {{ template ".Chart.Name .name" $ }} target: type: Utilization averageUtilization: {{ .TargetMemoryUtilizationPercentage }} @@ -126,7 +126,7 @@ spec: - type: ContainerResource containerResource: name: cpu - container: {{ $.Chart.Name }} + container: {{ template ".Chart.Name .name" $ }} target: type: Utilization averageUtilization: {{ .TargetCPUUtilizationPercentage }} @@ -135,7 +135,7 @@ spec: - type: ContainerResource containerResource: name: memory - container: {{ $.Chart.Name }} + container: {{ template ".Chart.Name .name" $ }} target: type: Utilization averageUtilization: {{ .TargetMemoryUtilizationPercentage }}