From 4cd291b13c2b2a5440b16398c4d6438dd50b550b Mon Sep 17 00:00:00 2001
From: Mahsa Soleimani <soleimanimahsa99@gmail.com>
Date: Tue, 27 Feb 2024 16:47:55 +0330
Subject: [PATCH] Servicemonitor (#9)

* Adding ServiceMonitor yaml files,
modify containerPort in clients deploymants

---------
Co-authored-by: Mahsa <mahsa.soleimani@snapp.cab>
---
 clients/harbor-client/charts/Chart.yaml             |  4 ++--
 .../harbor-client/charts/templates/deployment.yaml  |  2 +-
 .../charts/templates/servicemonitor.yaml            | 13 +++++++++++++
 clients/proxy-client/charts/Chart.yaml              |  4 ++--
 .../proxy-client/charts/templates/deployment.yaml   |  2 +-
 .../charts/templates/servicemonitor.yaml            | 13 +++++++++++++
 6 files changed, 32 insertions(+), 6 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/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/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/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"
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