refactor(monitoring): move WorkloadMonitor resources to extra/monitoring

WorkloadMonitor resources are only needed when extra/monitoring is
deployed. Move them from system/monitoring to extra/monitoring package.

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: IvanHunters <xorokhotnikov@gmail.com>

packages/extra/monitoring/templates/workloadmonitors.yaml

@@ -0,0 +1,150 @@
+{{- range .Values.metricsStorages }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: {{ .name }}-vmstorage
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: vmstorage
+  selector:
+    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/instance: {{ .name }}
+    app.kubernetes.io/name: vmstorage
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: {{ .name }}-vmselect
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: vmselect
+  selector:
+    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/instance: {{ .name }}
+    app.kubernetes.io/name: vmselect
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: {{ .name }}-vminsert
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: vminsert
+  selector:
+    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/instance: {{ .name }}
+    app.kubernetes.io/name: vminsert
+  version: {{ $.Chart.Version }}
+{{- end }}
+{{- range .Values.metricsStorages }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: vmalert-{{ .name }}
+spec:
+  replicas: 1
+  minReplicas: 1
+  kind: monitoring
+  type: vmalert
+  selector:
+    app.kubernetes.io/instance: vmalert-{{ .name }}
+    app.kubernetes.io/name: vmalert
+  version: {{ $.Chart.Version }}
+{{- break }}
+{{- end }}
+{{- range .Values.logsStorages }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: vlogs-{{ .name }}
+spec:
+  replicas: 1
+  minReplicas: 1
+  kind: monitoring
+  type: vlogs
+  selector:
+    app.kubernetes.io/component: monitoring
+    app.kubernetes.io/instance: {{ .name }}
+    app.kubernetes.io/name: vlogs
+  version: {{ $.Chart.Version }}
+{{- end }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: grafana
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: grafana
+  selector:
+    app: grafana
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: grafana-db
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: postgres
+  selector:
+    cnpg.io/cluster: grafana-db
+    cnpg.io/podRole: instance
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: alerta-db
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: postgres
+  selector:
+    cnpg.io/cluster: alerta-db
+    cnpg.io/podRole: instance
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: alerta
+spec:
+  replicas: 1
+  minReplicas: 1
+  kind: monitoring
+  type: alerta
+  selector:
+    app: alerta
+    release: alerta
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: alertmanager
+spec:
+  replicas: 3
+  minReplicas: 2
+  kind: monitoring
+  type: alertmanager
+  selector:
+    app.kubernetes.io/instance: alertmanager
+    app.kubernetes.io/name: vmalertmanager
+  version: {{ $.Chart.Version }}

packages/system/monitoring/templates/alerta/alerta-db.yaml

@@ -33,17 +33,3 @@ spec:
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: alerta-db
-spec:
-  replicas: 2
-  minReplicas: 1
-  kind: monitoring
-  type: postgres
-  selector:
-    cnpg.io/cluster: alerta-db
-    cnpg.io/podRole: instance
-  version: {{ $.Chart.Version }}

packages/system/monitoring/templates/alerta/alerta.yaml

@@ -193,20 +193,6 @@ spec:
                 port:
                   name: http
 ---
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: alerta
-spec:
-  replicas: 1
-  minReplicas: 1
-  kind: monitoring
-  type: alerta
-  selector:
-    app: alerta
-    release: alerta
-  version: {{ $.Chart.Version }}
----
 apiVersion: v1
 kind: Secret
 metadata:
@@ -259,17 +245,3 @@ spec:
   podMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: alertmanager
-spec:
-  replicas: 3
-  minReplicas: 2
-  kind: monitoring
-  type: alertmanager
-  selector:
-    app.kubernetes.io/instance: alertmanager
-    app.kubernetes.io/name: vmalertmanager
-  version: {{ $.Chart.Version }}

packages/system/monitoring/templates/grafana/db.yaml

@@ -27,17 +27,3 @@ spec:
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: grafana-db
-spec:
-  replicas: 2
-  minReplicas: 1
-  kind: monitoring
-  type: postgres
-  selector:
-    cnpg.io/cluster: grafana-db
-    cnpg.io/podRole: instance
-  version: {{ $.Chart.Version }}

packages/system/monitoring/templates/grafana/grafana.yaml

@@ -93,16 +93,3 @@ spec:
       - hosts:
         - "{{ printf "grafana.%s" (.Values.host | default $host) }}"
         secretName: grafana-ingress-tls
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: grafana
-spec:
-  replicas: 2
-  minReplicas: 1
-  kind: monitoring
-  type: grafana
-  selector:
-    app: grafana
-  version: {{ $.Chart.Version }}

packages/system/monitoring/templates/vlogs/vlogs.yaml

@@ -19,19 +19,4 @@ spec:
     accessModes: [ReadWriteOnce]
   retentionPeriod: "{{ .retentionPeriod }}"
   removePvcAfterDelete: true
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: vlogs-{{ .name }}
-spec:
-  replicas: 1
-  minReplicas: 1
-  kind: monitoring
-  type: vlogs
-  selector:
-    app.kubernetes.io/component: monitoring
-    app.kubernetes.io/instance: {{ .name }}
-    app.kubernetes.io/name: vlogs
-  version: {{ $.Chart.Version }}
 {{- end }}

packages/system/monitoring/templates/vm/vmalert.yaml

@@ -23,19 +23,5 @@ spec:
     url: http://vminsert-{{ .name }}.{{ $.Release.Namespace }}.svc:8480/insert/0/prometheus/api/v1/write
   resources: {}
   selectAllByDefault: true
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: vmalert-{{ .name }}
-spec:
-  replicas: 1
-  minReplicas: 1
-  kind: monitoring
-  type: vmalert
-  selector:
-    app.kubernetes.io/instance: vmalert-{{ .name }}
-    app.kubernetes.io/name: vmalert
-  version: {{ $.Chart.Version }}
 {{- break }}
 {{- end }}

packages/system/monitoring/templates/vm/vmcluster.yaml

@@ -49,49 +49,4 @@ spec:
             requests:
               storage: {{ .storage }}
     storageDataPath: /vm-data
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ .name }}-vmstorage
-spec:
-  replicas: 2
-  minReplicas: 1
-  kind: monitoring
-  type: vmstorage
-  selector:
-    app.kubernetes.io/component: monitoring
-    app.kubernetes.io/instance: {{ .name }}
-    app.kubernetes.io/name: vmstorage
-  version: {{ $.Chart.Version }}
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ .name }}-vmselect
-spec:
-  replicas: 2
-  minReplicas: 1
-  kind: monitoring
-  type: vmselect
-  selector:
-    app.kubernetes.io/component: monitoring
-    app.kubernetes.io/instance: {{ .name }}
-    app.kubernetes.io/name: vmselect
-  version: {{ $.Chart.Version }}
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ .name }}-vminsert
-spec:
-  replicas: 2
-  minReplicas: 1
-  kind: monitoring
-  type: vminsert
-  selector:
-    app.kubernetes.io/component: monitoring
-    app.kubernetes.io/instance: {{ .name }}
-    app.kubernetes.io/name: vminsert
-  version: {{ $.Chart.Version }}
 {{- end }}