Skip to content

Commit 27f2a4e

Browse files
pawan-59pawan-59
authored
fix for app metrics issue (#6282)
1 parent dc0fe70 commit 27f2a4e

File tree

8 files changed

+37
-5
lines changed

8 files changed

+37
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ spec:
186186
protocol: TCP
187187
name: envoy-admin
188188
{{- range $index, $element := .Values.ContainerPort }}
189-
- name: {{ $element.name}}
189+
- name: envoy-{{ $element.name}}
190190
containerPort: {{ $element.envoyPort | default (add 8790 $index) }}
191191
protocol: TCP
192192
{{- end }}

‎scripts/devtron-reference-helm-charts/deployment-chart_4-19-0/templates/service.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
{{- end }}
3434
{{- if .targetPort }}
3535
targetPort: {{ .targetPort }}
36+
{{- else if $.Values.appMetrics }}
37+
targetPort: envoy-{{ .name }}
3638
{{- else }}
3739
targetPort: {{ .name }}
3840
{{- end }}
@@ -69,7 +71,13 @@ spec:
6971
{{- else }}
7072
- port: {{ .port }}
7173
{{- end }}
74+
{{- if .targetPort }}
75+
targetPort: {{ .targetPort }}
76+
{{- else if $.Values.appMetrics }}
77+
targetPort: envoy-{{ .name }}
78+
{{- else }}
7279
targetPort: {{ .name }}
80+
{{- end }}
7381
protocol: TCP
7482
name: {{ .name }}
7583
{{- end }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ spec:
513513
protocol: TCP
514514
name: envoy-admin
515515
{{- range $index, $element := .Values.ContainerPort }}
516-
- name: {{ $element.name}}
516+
- name: envoy-{{ $element.name}}
517517
containerPort: {{ $element.envoyPort | default (add 8790 $index) }}
518518
protocol: TCP
519519
{{- end }}
@@ -1123,7 +1123,7 @@ spec:
11231123
protocol: TCP
11241124
name: envoy-admin
11251125
{{- range $index, $element := .Values.ContainerPort }}
1126-
- name: {{ $element.name}}
1126+
- name: envoy-{{ $element.name}}
11271127
containerPort: {{ $element.envoyPort | default (add 8790 $index) }}
11281128
protocol: TCP
11291129
{{- end }}

‎scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/service.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
{{- end }}
3434
{{- if .targetPort }}
3535
targetPort: {{ .targetPort }}
36+
{{- else if $.Values.appMetrics }}
37+
targetPort: envoy-{{ .name }}
3638
{{- else }}
3739
targetPort: {{ .name }}
3840
{{- end }}
@@ -80,7 +82,13 @@ spec:
8082
{{- else }}
8183
- port: {{ .port }}
8284
{{- end }}
85+
{{- if .targetPort }}
86+
targetPort: {{ .targetPort }}
87+
{{- else if $.Values.appMetrics }}
88+
targetPort: envoy-{{ .name }}
89+
{{- else }}
8390
targetPort: {{ .name }}
91+
{{- end }}
8492
protocol: TCP
8593
name: {{ .name }}
8694
{{- end }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ spec:
186186
protocol: TCP
187187
name: envoy-admin
188188
{{- range $index, $element := .Values.ContainerPort }}
189-
- name: {{ $element.name}}
189+
- name: envoy-{{ $element.name}}
190190
containerPort: {{ $element.envoyPort | default (add 8790 $index) }}
191191
protocol: TCP
192192
{{- end }}

‎scripts/devtron-reference-helm-charts/reference-chart_4-19-0/templates/service.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
{{- end }}
3434
{{- if .targetPort }}
3535
targetPort: {{ .targetPort }}
36+
{{- else if $.Values.appMetrics }}
37+
targetPort: envoy-{{ .name }}
3638
{{- else }}
3739
targetPort: {{ .name }}
3840
{{- end }}
@@ -69,7 +71,13 @@ spec:
6971
{{- else }}
7072
- port: {{ .port }}
7173
{{- end }}
74+
{{- if .targetPort }}
75+
targetPort: {{ .targetPort }}
76+
{{- else if $.Values.appMetrics }}
77+
targetPort: envoy-{{ .name }}
78+
{{- else }}
7279
targetPort: {{ .name }}
80+
{{- end }}
7381
protocol: TCP
7482
name: {{ .name }}
7583
{{- end }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ spec:
487487
protocol: TCP
488488
name: envoy-admin
489489
{{- range $index, $element := .Values.ContainerPort }}
490-
- name: {{ $element.name}}
490+
- name: envoy-{{ $element.name}}
491491
containerPort: {{ $element.envoyPort | default (add 8790 $index) }}
492492
protocol: TCP
493493
{{- end }}

‎scripts/devtron-reference-helm-charts/reference-chart_4-20-0/templates/service.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ spec:
3333
{{- end }}
3434
{{- if .targetPort }}
3535
targetPort: {{ .targetPort }}
36+
{{- else if $.Values.appMetrics }}
37+
targetPort: envoy-{{ .name }}
3638
{{- else }}
3739
targetPort: {{ .name }}
3840
{{- end }}
@@ -83,7 +85,13 @@ spec:
8385
{{- else }}
8486
- port: {{ .port }}
8587
{{- end }}
88+
{{- if .targetPort }}
89+
targetPort: {{ .targetPort }}
90+
{{- else if $.Values.appMetrics }}
91+
targetPort: envoy-{{ .name }}
92+
{{- else }}
8693
targetPort: {{ .name }}
94+
{{- end }}
8795
protocol: TCP
8896
name: {{ .name }}
8997
{{- end }}

0 commit comments

Comments
 (0)