clusters/cl01tl/manifests/external-secrets/ClusterRole-external-secrets-cert-controller.yaml

@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "cert-controller"
 rules:
   - apiGroups:
       - "apiextensions.k8s.io"

clusters/cl01tl/manifests/external-secrets/ClusterRoleBinding-external-secrets-cert-controller.yaml

@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "cert-controller"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

clusters/cl01tl/manifests/external-secrets/Deployment-external-secrets-cert-controller.yaml

@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "cert-controller"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -24,6 +25,7 @@ spec:
         app.kubernetes.io/instance: external-secrets
         app.kubernetes.io/version: "v2.2.0"
         app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/metrics: "cert-controller"
     spec:
       serviceAccountName: external-secrets-cert-controller
       automountServiceAccountToken: true

clusters/cl01tl/manifests/external-secrets/Deployment-external-secrets-webhook.yaml

@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -24,6 +25,7 @@ spec:
         app.kubernetes.io/instance: external-secrets
         app.kubernetes.io/version: "v2.2.0"
         app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/metrics: "webhook"
     spec:
       hostNetwork: false
       serviceAccountName: external-secrets-webhook

clusters/cl01tl/manifests/external-secrets/Secret-external-secrets-webhook.yaml

@@ -9,4 +9,5 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"
     external-secrets.io/component: webhook

clusters/cl01tl/manifests/external-secrets/Service-external-secrets-cert-controller-metrics.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: external-secrets-cert-controller-metrics
+  namespace: external-secrets
+  labels:
+    helm.sh/chart: external-secrets-2.2.0
+    app.kubernetes.io/name: external-secrets-cert-controller
+    app.kubernetes.io/instance: external-secrets
+    app.kubernetes.io/version: "v2.2.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "cert-controller"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 8080
+      protocol: TCP
+      targetPort: metrics
+      name: metrics
+  selector:
+    app.kubernetes.io/name: external-secrets-cert-controller
+    app.kubernetes.io/instance: external-secrets

clusters/cl01tl/manifests/external-secrets/Service-external-secrets-metrics.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: external-secrets-metrics
+  namespace: external-secrets
+  labels:
+    helm.sh/chart: external-secrets-2.2.0
+    app.kubernetes.io/name: external-secrets
+    app.kubernetes.io/instance: external-secrets
+    app.kubernetes.io/version: "v2.2.0"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  type: ClusterIP
+  ports:
+    - port: 8080
+      protocol: TCP
+      targetPort: metrics
+      name: metrics
+  selector:
+    app.kubernetes.io/name: external-secrets
+    app.kubernetes.io/instance: external-secrets

clusters/cl01tl/manifests/external-secrets/Service-external-secrets-webhook.yaml

@@ -9,6 +9,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"
     external-secrets.io/component: webhook
 spec:
   type: ClusterIP
@@ -17,6 +18,10 @@ spec:
       targetPort: webhook
       protocol: TCP
       name: webhook
+    - port: 8080
+      protocol: TCP
+      targetPort: metrics
+      name: metrics
   selector:
     app.kubernetes.io/name: external-secrets-webhook
     app.kubernetes.io/instance: external-secrets

clusters/cl01tl/manifests/external-secrets/ServiceAccount-external-secrets-cert-controller.yaml

@@ -9,3 +9,4 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "cert-controller"

clusters/cl01tl/manifests/external-secrets/ServiceAccount-external-secrets-webhook.yaml

@@ -9,3 +9,4 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"

clusters/cl01tl/manifests/external-secrets/ServiceMonitor-external-secrets-cert-controller-metrics.yaml

@@ -0,0 +1,26 @@
+apiVersion: "monitoring.coreos.com/v1"
+kind: ServiceMonitor
+metadata:
+  labels:
+    helm.sh/chart: external-secrets-2.2.0
+    app.kubernetes.io/name: external-secrets-cert-controller
+    app.kubernetes.io/instance: external-secrets
+    app.kubernetes.io/version: "v2.2.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "cert-controller"
+  name: external-secrets-cert-controller-metrics
+  namespace: "external-secrets"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: external-secrets-cert-controller
+      app.kubernetes.io/instance: external-secrets
+      app.kubernetes.io/metrics: "cert-controller"
+  namespaceSelector:
+    matchNames:
+      - external-secrets
+  endpoints:
+    - port: metrics
+      interval: 30s
+      scrapeTimeout: 25s
+      honorLabels: false

clusters/cl01tl/manifests/external-secrets/ServiceMonitor-external-secrets-metrics.yaml

@@ -0,0 +1,24 @@
+apiVersion: "monitoring.coreos.com/v1"
+kind: ServiceMonitor
+metadata:
+  labels:
+    helm.sh/chart: external-secrets-2.2.0
+    app.kubernetes.io/name: external-secrets
+    app.kubernetes.io/instance: external-secrets
+    app.kubernetes.io/version: "v2.2.0"
+    app.kubernetes.io/managed-by: Helm
+  name: external-secrets-metrics
+  namespace: "external-secrets"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: external-secrets
+      app.kubernetes.io/instance: external-secrets
+  namespaceSelector:
+    matchNames:
+      - external-secrets
+  endpoints:
+    - port: metrics
+      interval: 30s
+      scrapeTimeout: 25s
+      honorLabels: false

clusters/cl01tl/manifests/external-secrets/ServiceMonitor-external-secrets-webhook-metrics.yaml

@@ -0,0 +1,26 @@
+apiVersion: "monitoring.coreos.com/v1"
+kind: ServiceMonitor
+metadata:
+  labels:
+    helm.sh/chart: external-secrets-2.2.0
+    app.kubernetes.io/name: external-secrets-webhook
+    app.kubernetes.io/instance: external-secrets
+    app.kubernetes.io/version: "v2.2.0"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"
+  name: external-secrets-webhook-metrics
+  namespace: "external-secrets"
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: external-secrets-webhook
+      app.kubernetes.io/instance: external-secrets
+      app.kubernetes.io/metrics: "webhook"
+  namespaceSelector:
+    matchNames:
+      - external-secrets
+  endpoints:
+    - port: metrics
+      interval: 30s
+      scrapeTimeout: 25s
+      honorLabels: false

clusters/cl01tl/manifests/external-secrets/ValidatingWebhookConfiguration-externalsecret-validate.yaml

@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"
     external-secrets.io/component: webhook
 webhooks:
   - name: "validate.externalsecret.external-secrets.io"

clusters/cl01tl/manifests/external-secrets/ValidatingWebhookConfiguration-secretstore-validate.yaml

@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/instance: external-secrets
     app.kubernetes.io/version: "v2.2.0"
     app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/metrics: "webhook"
     external-secrets.io/component: webhook
 webhooks:
   - name: "validate.secretstore.external-secrets.io"

clusters/cl01tl/manifests/stalwart/Elasticsearch-elasticsearch-stalwart.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/instance: stalwart
     app.kubernetes.io/part-of: stalwart
 spec:
-  version: 9.3.2
+  version: 9.3.3
   auth:
     fileRealm:
       - secretName: stalwart-elasticsearch-secret

clusters/cl01tl/manifests/tubearchivist/Elasticsearch-elasticsearch-tubearchivist.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/instance: tubearchivist
     app.kubernetes.io/part-of: tubearchivist
 spec:
-  version: 9.3.2
+  version: 9.3.3
   auth:
     fileRealm:
       - secretName: tubearchivist-elasticsearch-secret