From 44dea02b7e7277591423d33ce35f7d360d1402bb Mon Sep 17 00:00:00 2001 From: jaya-kops Date: Wed, 4 Sep 2024 22:51:00 +0530 Subject: [PATCH 1/3] metrics port updation --- charts/cron-job/templates/cronJob.yaml | 2 ++ charts/cron-job/templates/service.yaml | 4 +++- charts/cron-job/templates/serviceMonitor.yaml | 4 +++- charts/service/templates/deployment.yaml | 2 ++ charts/service/templates/service.yaml | 4 +++- charts/service/templates/serviceMonitor.yaml | 8 +++++--- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/charts/cron-job/templates/cronJob.yaml b/charts/cron-job/templates/cronJob.yaml index 9d3f7ce..d2eb785 100644 --- a/charts/cron-job/templates/cronJob.yaml +++ b/charts/cron-job/templates/cronJob.yaml @@ -64,8 +64,10 @@ spec: {{- end }} imagePullPolicy: IfNotPresent ports: + {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} - name: metrics-port containerPort: {{ .Values.metricsPort }} + {{- end }} envFrom: {{- range $i, $name := .Values.envFrom.configmaps }} - configMapRef: diff --git a/charts/cron-job/templates/service.yaml b/charts/cron-job/templates/service.yaml index c2e3f2b..12d3318 100644 --- a/charts/cron-job/templates/service.yaml +++ b/charts/cron-job/templates/service.yaml @@ -9,9 +9,11 @@ spec: - name: http-port port: 80 targetPort: {{ .Values.httpPort}} + {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} - name: metrics-port port: 2121 - targetPort: {{ .Values.metricsPort}} + targetPort: {{ .Values.metricsPort }} + {{- end }} selector: app: {{ .Values.name }} type: NodePort diff --git a/charts/cron-job/templates/serviceMonitor.yaml b/charts/cron-job/templates/serviceMonitor.yaml index d2e0bc6..9fb3a28 100644 --- a/charts/cron-job/templates/serviceMonitor.yaml +++ b/charts/cron-job/templates/serviceMonitor.yaml @@ -10,7 +10,9 @@ spec: matchLabels: app: {{.Values.name}} endpoints: + {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval 0) }} - port: metrics-port - interval: {{.Values.metricsScrapeInterval }} + interval: {{ .Values.metricsScrapeInterval }} path: /metrics + {{- end }} --- \ No newline at end of file diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml index 44eadaf..a8f4e49 100644 --- a/charts/service/templates/deployment.yaml +++ b/charts/service/templates/deployment.yaml @@ -77,8 +77,10 @@ spec: ports: - name: http-port containerPort: {{ .Values.httpPort }} + {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} - name: metrics-port containerPort: {{ .Values.metricsPort }} + {{- end }} {{- range $k, $v := .Values.ports}} - name: {{ $k }} containerPort: {{ $v }} diff --git a/charts/service/templates/service.yaml b/charts/service/templates/service.yaml index ccc10be..7bb412b 100644 --- a/charts/service/templates/service.yaml +++ b/charts/service/templates/service.yaml @@ -9,9 +9,11 @@ spec: - name: http-port port: 80 targetPort: {{ .Values.httpPort}} + {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} - name: metrics-port port: 2121 - targetPort: {{ .Values.metricsPort}} + targetPort: {{ .Values.metricsPort }} + {{- end}} {{- range $k, $v := .Values.ports}} - name: {{ $k}} port: {{ $v }} diff --git a/charts/service/templates/serviceMonitor.yaml b/charts/service/templates/serviceMonitor.yaml index d2e0bc6..82ab8e1 100644 --- a/charts/service/templates/serviceMonitor.yaml +++ b/charts/service/templates/serviceMonitor.yaml @@ -10,7 +10,9 @@ spec: matchLabels: app: {{.Values.name}} endpoints: - - port: metrics-port - interval: {{.Values.metricsScrapeInterval }} - path: /metrics + {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval 0) }} + - port: metrics-port + interval: {{ .Values.metricsScrapeInterval }} + path: /metrics + {{- end }} --- \ No newline at end of file From 4e6795d4c7f1e1fd119205969ece3cd1ee4b1a86 Mon Sep 17 00:00:00 2001 From: arunesh-kops Date: Thu, 5 Sep 2024 16:01:43 +0530 Subject: [PATCH 2/3] update metrics condition --- charts/cron-job/templates/cronJob.yaml | 6 +++--- charts/cron-job/templates/service.yaml | 2 +- charts/cron-job/templates/serviceMonitor.yaml | 2 +- charts/service/templates/deployment.yaml | 2 +- charts/service/templates/service.yaml | 2 +- charts/service/templates/serviceMonitor.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/cron-job/templates/cronJob.yaml b/charts/cron-job/templates/cronJob.yaml index d2eb785..fe8f898 100644 --- a/charts/cron-job/templates/cronJob.yaml +++ b/charts/cron-job/templates/cronJob.yaml @@ -64,9 +64,9 @@ spec: {{- end }} imagePullPolicy: IfNotPresent ports: - {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} - - name: metrics-port - containerPort: {{ .Values.metricsPort }} + {{- if and .Values.metricsPort (ne (int .Values.metricsPort) 0) }} + - name: metrics-port + containerPort: {{ .Values.metricsPort }} {{- end }} envFrom: {{- range $i, $name := .Values.envFrom.configmaps }} diff --git a/charts/cron-job/templates/service.yaml b/charts/cron-job/templates/service.yaml index 12d3318..71dcf54 100644 --- a/charts/cron-job/templates/service.yaml +++ b/charts/cron-job/templates/service.yaml @@ -9,7 +9,7 @@ spec: - name: http-port port: 80 targetPort: {{ .Values.httpPort}} - {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} + {{- if and .Values.metricsPort (ne (int .Values.metricsPort) 0) }} - name: metrics-port port: 2121 targetPort: {{ .Values.metricsPort }} diff --git a/charts/cron-job/templates/serviceMonitor.yaml b/charts/cron-job/templates/serviceMonitor.yaml index 9fb3a28..16863d5 100644 --- a/charts/cron-job/templates/serviceMonitor.yaml +++ b/charts/cron-job/templates/serviceMonitor.yaml @@ -10,7 +10,7 @@ spec: matchLabels: app: {{.Values.name}} endpoints: - {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval 0) }} + {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval "0s") }} - port: metrics-port interval: {{ .Values.metricsScrapeInterval }} path: /metrics diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml index a8f4e49..99b9c22 100644 --- a/charts/service/templates/deployment.yaml +++ b/charts/service/templates/deployment.yaml @@ -77,7 +77,7 @@ spec: ports: - name: http-port containerPort: {{ .Values.httpPort }} - {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} + {{- if and .Values.metricsPort (ne ( int .Values.metricsPort ) 0) }} - name: metrics-port containerPort: {{ .Values.metricsPort }} {{- end }} diff --git a/charts/service/templates/service.yaml b/charts/service/templates/service.yaml index 7bb412b..85e4d49 100644 --- a/charts/service/templates/service.yaml +++ b/charts/service/templates/service.yaml @@ -9,7 +9,7 @@ spec: - name: http-port port: 80 targetPort: {{ .Values.httpPort}} - {{- if and .Values.metricsPort (ne .Values.metricsPort 0) }} + {{- if and .Values.metricsPort (ne (int .Values.metricsPort) 0) }} - name: metrics-port port: 2121 targetPort: {{ .Values.metricsPort }} diff --git a/charts/service/templates/serviceMonitor.yaml b/charts/service/templates/serviceMonitor.yaml index 82ab8e1..ba3ae0b 100644 --- a/charts/service/templates/serviceMonitor.yaml +++ b/charts/service/templates/serviceMonitor.yaml @@ -10,7 +10,7 @@ spec: matchLabels: app: {{.Values.name}} endpoints: - {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval 0) }} + {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval "0s") }} - port: metrics-port interval: {{ .Values.metricsScrapeInterval }} path: /metrics From a70fc43599611484d82dcc5c6291ac61f88ee16b Mon Sep 17 00:00:00 2001 From: jaya-kops Date: Thu, 5 Sep 2024 16:16:16 +0530 Subject: [PATCH 3/3] metrics port updation 2 --- charts/cron-job/templates/serviceMonitor.yaml | 2 +- charts/service/templates/serviceMonitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/cron-job/templates/serviceMonitor.yaml b/charts/cron-job/templates/serviceMonitor.yaml index 16863d5..d998b3c 100644 --- a/charts/cron-job/templates/serviceMonitor.yaml +++ b/charts/cron-job/templates/serviceMonitor.yaml @@ -10,7 +10,7 @@ spec: matchLabels: app: {{.Values.name}} endpoints: - {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval "0s") }} + {{- if .Values.metricsPort}} - port: metrics-port interval: {{ .Values.metricsScrapeInterval }} path: /metrics diff --git a/charts/service/templates/serviceMonitor.yaml b/charts/service/templates/serviceMonitor.yaml index ba3ae0b..262f769 100644 --- a/charts/service/templates/serviceMonitor.yaml +++ b/charts/service/templates/serviceMonitor.yaml @@ -10,7 +10,7 @@ spec: matchLabels: app: {{.Values.name}} endpoints: - {{- if and .Values.metricsScrapeInterval (ne .Values.metricsScrapeInterval "0s") }} + {{- if .Values.metricsPort}} - port: metrics-port interval: {{ .Values.metricsScrapeInterval }} path: /metrics