:bug: fixing servicemonitor bug in 0.8.0 (#2136)

* fix: removing service monitor duplicate definition

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

* Adding new command to a helm release

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

* Adding also servicemonitor.yaml fixes

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

---------

Signed-off-by: Gustavo Carvalho <gusfcarvalho@gmail.com>

deploy/charts/external-secrets/templates/cert-controller-servicemonitor.yaml

@@ -1,38 +0,0 @@
-{{- if and .Values.certController.create .Values.certController.serviceMonitor.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "external-secrets.fullname" . }}-cert-controller-metrics
-  labels:
-    {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  ports:
-  - port: 8080
-    protocol: TCP
-    name: metrics
-  selector:
-    {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 4 }}
----
-apiVersion: "monitoring.coreos.com/v1"
-kind: ServiceMonitor
-metadata:
-  labels:
-    {{- include "external-secrets-cert-controller.labels" . | nindent 4 }}
-{{- if .Values.certController.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.certController.serviceMonitor.additionalLabels | indent 4 }}
-{{- end }}
-  name: {{ include "external-secrets.fullname" . }}-cert-controller-metrics
-  namespace: {{ .Release.Namespace | quote }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "external-secrets-cert-controller.selectorLabels" . | nindent 6 }}
-  namespaceSelector:
-    matchNames:
-    - {{ .Release.Namespace | quote }}
-  endpoints:
-  - port: metrics
-    interval: {{ .Values.certController.serviceMonitor.interval }}
-    scrapeTimeout: {{ .Values.certController.serviceMonitor.scrapeTimeout }}
-{{- end }}

deploy/charts/external-secrets/templates/servicemonitor.yaml

@@ -94,6 +94,7 @@ spec:
       {{- toYaml . | nindent 6 }}
     {{- end }}
 {{- end }}
+---
 {{- if .Values.certController.create }}
 apiVersion: v1
 kind: Service

deploy/charts/external-secrets/templates/webhook-servicemonitor.yaml

@@ -1,38 +0,0 @@
-{{- if and .Values.webhook.create .Values.webhook.serviceMonitor.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "external-secrets.fullname" . }}-webhook-metrics
-  labels:
-    {{- include "external-secrets-webhook.selectorLabels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  ports:
-  - port: 8080
-    protocol: TCP
-    name: metrics
-  selector:
-    {{- include "external-secrets-webhook.selectorLabels" . | nindent 4 }}
----
-apiVersion: "monitoring.coreos.com/v1"
-kind: ServiceMonitor
-metadata:
-  labels:
-    {{- include "external-secrets-webhook.labels" . | nindent 4 }}
-{{- if .Values.webhook.serviceMonitor.additionalLabels }}
-{{ toYaml .Values.webhook.serviceMonitor.additionalLabels | indent 4 }}
-{{- end }}
-  name: {{ include "external-secrets.fullname" . }}-webhook-metrics
-  namespace: {{ .Release.Namespace | quote }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "external-secrets-webhook.selectorLabels" . | nindent 6 }}
-  namespaceSelector:
-    matchNames:
-    - {{ .Release.Namespace | quote }}
-  endpoints:
-  - port: metrics
-    interval: {{ .Values.webhook.serviceMonitor.interval }}
-    scrapeTimeout: {{ .Values.webhook.serviceMonitor.scrapeTimeout }}
-{{- end }}

docs/contributing/release.md

@@ -13,6 +13,7 @@ The external-secrets project is released on a as-needed basis. Feel free to open
 ## Release Helm Chart
 
 1. Update `version` and/or `appVersion` in `Chart.yaml` and run `make helm.docs helm.update.appversion`
+1. If there is any CRD change, run `make helm.test.update` and `make helm.test`
 1. push to branch and open pr
 1. run `/ok-to-test-managed` commands for all cloud providers
 1. merge PR if everyhing is green