Merge 2f7f8f9 into 589de48

snapp-incubator · Feb 27, 2024 · 518b58d · 518b58d
2 parents 589de48 + 2f7f8f9
commit 518b58d
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 14 deletions.
diff --git 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
@@ -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
@@ -1,13 +1,33 @@
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "snappcloud-harbor-client.fullname" . }}
+  name: {{ include "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
@@ -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
@@ -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
@@ -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
@@ -1,13 +1,33 @@
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "snappcloud-proxy-client.fullname" . }}
+  name: {{ include "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
@@ -14,7 +14,7 @@ podLabels: { }
 
 service:
   type: ClusterIP
-  port: 8080
+  port: 9090
 
 resources:
   limits: