From 8e11848b89ad3667a4617be01625c032afd48eef Mon Sep 17 00:00:00 2001 From: Mahsa Date: Tue, 27 Feb 2024 16:32:12 +0330 Subject: [PATCH 1/5] Adding ServiceMonitor yaml files, modify containerPort in clients deploymants --- .../harbor-client/charts/templates/deployment.yaml | 2 +- .../charts/templates/servicemonitor.yaml | 13 +++++++++++++ .../proxy-client/charts/templates/deployment.yaml | 2 +- .../charts/templates/servicemonitor.yaml | 13 +++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 clients/harbor-client/charts/templates/servicemonitor.yaml create mode 100644 clients/proxy-client/charts/templates/servicemonitor.yaml diff --git a/clients/harbor-client/charts/templates/deployment.yaml b/clients/harbor-client/charts/templates/deployment.yaml index 1609bea..9f20ebf 100644 --- a/clients/harbor-client/charts/templates/deployment.yaml +++ b/clients/harbor-client/charts/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP env: - name: IMAGE_REFERENCE diff --git a/clients/harbor-client/charts/templates/servicemonitor.yaml b/clients/harbor-client/charts/templates/servicemonitor.yaml new file mode 100644 index 0000000..12322e3 --- /dev/null +++ b/clients/harbor-client/charts/templates/servicemonitor.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "snappcloud-harbor-client.fullname" . }} + labels: + {{- include "snappcloud-harbor-client.labels" . | nindent 4 }} +spec: + selector: + matchLabels: + {{- include "snappcloud-harbor-client.selectorLabels" . | nindent 4 }} + endpoints: + - port: http + interval: 30s diff --git a/clients/proxy-client/charts/templates/deployment.yaml b/clients/proxy-client/charts/templates/deployment.yaml index b4d0b6c..daa9e37 100644 --- a/clients/proxy-client/charts/templates/deployment.yaml +++ b/clients/proxy-client/charts/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP env: - name: PROXY_URL diff --git a/clients/proxy-client/charts/templates/servicemonitor.yaml b/clients/proxy-client/charts/templates/servicemonitor.yaml new file mode 100644 index 0000000..fc2b5a8 --- /dev/null +++ b/clients/proxy-client/charts/templates/servicemonitor.yaml @@ -0,0 +1,13 @@ +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "snappcloud-proxy-client.fullname" . }} + labels: + {{- include "snappcloud-proxy-client.labels" . | nindent 4 }} +spec: + selector: + matchLabels: + {{- include "snappcloud-proxy-client.selectorLabels" . | nindent 4 }} + endpoints: + - port: http + interval: 30s From 86b24154fcc799781fac06185bcdb9d5cc86a007 Mon Sep 17 00:00:00 2001 From: Mahsa Date: Tue, 27 Feb 2024 16:45:30 +0330 Subject: [PATCH 2/5] Versioning --- clients/harbor-client/charts/Chart.yaml | 4 ++-- clients/proxy-client/charts/Chart.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clients/harbor-client/charts/Chart.yaml b/clients/harbor-client/charts/Chart.yaml index 4227b6e..2e74d33 100644 --- a/clients/harbor-client/charts/Chart.yaml +++ b/clients/harbor-client/charts/Chart.yaml @@ -3,5 +3,5 @@ name: snappcloud-harbor-client description: A Helm chart for snappcloud-harbor-client type: application -version: 0.1.1 -appVersion: "0.0.2" +version: 0.1.2 +appVersion: "0.0.3" diff --git a/clients/proxy-client/charts/Chart.yaml b/clients/proxy-client/charts/Chart.yaml index 0a87e7b..b34b0bd 100644 --- a/clients/proxy-client/charts/Chart.yaml +++ b/clients/proxy-client/charts/Chart.yaml @@ -3,5 +3,5 @@ name: snappcloud-proxy-client description: A Helm chart for snappcloud-proxy-client type: application -version: 0.1.1 -appVersion: "0.0.2" +version: 0.1.2 +appVersion: "0.0.3" From 2a517267f1ee42d11b033efb67483b9283d2221a Mon Sep 17 00:00:00 2001 From: Mahsa Date: Tue, 27 Feb 2024 17:54:10 +0330 Subject: [PATCH 3/5] fix indentation --- clients/harbor-client/charts/templates/servicemonitor.yaml | 2 +- clients/proxy-client/charts/templates/servicemonitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/harbor-client/charts/templates/servicemonitor.yaml b/clients/harbor-client/charts/templates/servicemonitor.yaml index 12322e3..02a13e9 100644 --- a/clients/harbor-client/charts/templates/servicemonitor.yaml +++ b/clients/harbor-client/charts/templates/servicemonitor.yaml @@ -7,7 +7,7 @@ metadata: spec: selector: matchLabels: - {{- include "snappcloud-harbor-client.selectorLabels" . | nindent 4 }} + {{- include "snappcloud-harbor-client.selectorLabels" . | nindent 6 }} endpoints: - port: http interval: 30s diff --git a/clients/proxy-client/charts/templates/servicemonitor.yaml b/clients/proxy-client/charts/templates/servicemonitor.yaml index fc2b5a8..903a6ee 100644 --- a/clients/proxy-client/charts/templates/servicemonitor.yaml +++ b/clients/proxy-client/charts/templates/servicemonitor.yaml @@ -7,7 +7,7 @@ metadata: spec: selector: matchLabels: - {{- include "snappcloud-proxy-client.selectorLabels" . | nindent 4 }} + {{- include "snappcloud-proxy-client.selectorLabels" . | nindent 6 }} endpoints: - port: http interval: 30s From 2f281e9c77ae55c997d170079555fb279a12f14c Mon Sep 17 00:00:00 2001 From: Mahsa Date: Wed, 28 Feb 2024 00:05:18 +0330 Subject: [PATCH 4/5] edit service monitor --- clients/harbor-client/charts/Chart.yaml | 2 +- .../charts/templates/service.yaml | 3 +- .../charts/templates/servicemonitor.yaml | 28 ++++++++++++++++--- clients/proxy-client/charts/Chart.yaml | 2 +- .../charts/templates/deployment.yaml | 2 +- .../charts/templates/service.yaml | 3 +- .../charts/templates/servicemonitor.yaml | 28 ++++++++++++++++--- clients/proxy-client/charts/values.yaml | 2 +- 8 files changed, 56 insertions(+), 14 deletions(-) diff --git a/clients/harbor-client/charts/Chart.yaml b/clients/harbor-client/charts/Chart.yaml index 2e74d33..61cde65 100644 --- a/clients/harbor-client/charts/Chart.yaml +++ b/clients/harbor-client/charts/Chart.yaml @@ -3,5 +3,5 @@ name: snappcloud-harbor-client description: A Helm chart for snappcloud-harbor-client type: application -version: 0.1.2 +version: 0.1.3 appVersion: "0.0.3" diff --git a/clients/harbor-client/charts/templates/service.yaml b/clients/harbor-client/charts/templates/service.yaml index c84d752..594edf7 100644 --- a/clients/harbor-client/charts/templates/service.yaml +++ b/clients/harbor-client/charts/templates/service.yaml @@ -5,7 +5,8 @@ metadata: spec: type: {{ .Values.service.type }} ports: - - port: {{ .Values.service.port }} + - name: http + port: {{ .Values.service.port }} targetPort: http protocol: TCP selector: diff --git a/clients/harbor-client/charts/templates/servicemonitor.yaml b/clients/harbor-client/charts/templates/servicemonitor.yaml index 02a13e9..c574fb9 100644 --- a/clients/harbor-client/charts/templates/servicemonitor.yaml +++ b/clients/harbor-client/charts/templates/servicemonitor.yaml @@ -1,13 +1,33 @@ +{{- if .Values.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "snappcloud-harbor-client.fullname" . }} + name: {{ template "snappcloud-harbor-client.fullname" . }} labels: {{- include "snappcloud-harbor-client.labels" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "snappcloud-harbor-client.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} spec: - selector: - matchLabels: - {{- include "snappcloud-harbor-client.selectorLabels" . | nindent 6 }} endpoints: - port: http interval: 30s + {{- if .Values.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} + {{- end }} + path: /metrics + honorLabels: {{ .Values.serviceMonitor.honorLabels }} + {{- if .Values.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{- tpl (toYaml .Values.serviceMonitor.metricRelabelings | nindent 4) . }} + {{- end }} + {{- if .Values.serviceMonitor.relabelings }} + relabelings: + {{ toYaml .Values.serviceMonitor.relabelings | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- include "snappcloud-harbor-client.selectorLabels" . | nindent 6 }} +{{- end -}} + + diff --git a/clients/proxy-client/charts/Chart.yaml b/clients/proxy-client/charts/Chart.yaml index b34b0bd..6a254f6 100644 --- a/clients/proxy-client/charts/Chart.yaml +++ b/clients/proxy-client/charts/Chart.yaml @@ -3,5 +3,5 @@ name: snappcloud-proxy-client description: A Helm chart for snappcloud-proxy-client type: application -version: 0.1.2 +version: 0.1.3 appVersion: "0.0.3" diff --git a/clients/proxy-client/charts/templates/deployment.yaml b/clients/proxy-client/charts/templates/deployment.yaml index daa9e37..37d8de5 100644 --- a/clients/proxy-client/charts/templates/deployment.yaml +++ b/clients/proxy-client/charts/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http - containerPort: 8080 + containerPort: 9090 protocol: TCP env: - name: PROXY_URL diff --git a/clients/proxy-client/charts/templates/service.yaml b/clients/proxy-client/charts/templates/service.yaml index e50c51a..3312e52 100644 --- a/clients/proxy-client/charts/templates/service.yaml +++ b/clients/proxy-client/charts/templates/service.yaml @@ -5,7 +5,8 @@ metadata: spec: type: {{ .Values.service.type }} ports: - - port: {{ .Values.service.port }} + - name: http + port: {{ .Values.service.port }} targetPort: http protocol: TCP selector: diff --git a/clients/proxy-client/charts/templates/servicemonitor.yaml b/clients/proxy-client/charts/templates/servicemonitor.yaml index 903a6ee..532f0c6 100644 --- a/clients/proxy-client/charts/templates/servicemonitor.yaml +++ b/clients/proxy-client/charts/templates/servicemonitor.yaml @@ -1,13 +1,33 @@ +{{- if .Values.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "snappcloud-proxy-client.fullname" . }} + name: {{ template "snappcloud-proxy-client.fullname" . }} labels: {{- include "snappcloud-proxy-client.labels" . | nindent 4 }} + {{- if .Values.commonLabels }} + {{- include "snappcloud-proxy-client.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} + {{- end }} spec: - selector: - matchLabels: - {{- include "snappcloud-proxy-client.selectorLabels" . | nindent 6 }} endpoints: - port: http interval: 30s + {{- if .Values.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} + {{- end }} + path: /metrics + honorLabels: {{ .Values.serviceMonitor.honorLabels }} + {{- if .Values.serviceMonitor.metricRelabelings }} + metricRelabelings: + {{- tpl (toYaml .Values.serviceMonitor.metricRelabelings | nindent 4) . }} + {{- end }} + {{- if .Values.serviceMonitor.relabelings }} + relabelings: + {{ toYaml .Values.serviceMonitor.relabelings | nindent 4 }} + {{- end }} + selector: + matchLabels: + {{- include "snappcloud-proxy-client.selectorLabels" . | nindent 6 }} +{{- end -}} + + diff --git a/clients/proxy-client/charts/values.yaml b/clients/proxy-client/charts/values.yaml index 538d257..081a1c1 100644 --- a/clients/proxy-client/charts/values.yaml +++ b/clients/proxy-client/charts/values.yaml @@ -14,7 +14,7 @@ podLabels: { } service: type: ClusterIP - port: 8080 + port: 9090 resources: limits: From 2f7f8f9140f6caa320c427bfb55266a6a78a4eb6 Mon Sep 17 00:00:00 2001 From: Mahsa Date: Wed, 28 Feb 2024 01:12:46 +0330 Subject: [PATCH 5/5] fix template --- clients/harbor-client/charts/templates/servicemonitor.yaml | 2 +- clients/proxy-client/charts/templates/servicemonitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/harbor-client/charts/templates/servicemonitor.yaml b/clients/harbor-client/charts/templates/servicemonitor.yaml index c574fb9..cd341c3 100644 --- a/clients/harbor-client/charts/templates/servicemonitor.yaml +++ b/clients/harbor-client/charts/templates/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "snappcloud-harbor-client.fullname" . }} + name: {{ include "snappcloud-harbor-client.fullname" . }} labels: {{- include "snappcloud-harbor-client.labels" . | nindent 4 }} {{- if .Values.commonLabels }} diff --git a/clients/proxy-client/charts/templates/servicemonitor.yaml b/clients/proxy-client/charts/templates/servicemonitor.yaml index 532f0c6..ada3af7 100644 --- a/clients/proxy-client/charts/templates/servicemonitor.yaml +++ b/clients/proxy-client/charts/templates/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "snappcloud-proxy-client.fullname" . }} + name: {{ include "snappcloud-proxy-client.fullname" . }} labels: {{- include "snappcloud-proxy-client.labels" . | nindent 4 }} {{- if .Values.commonLabels }}