From 0e22358b304e4efde0b593a30edeee2e4453d05a Mon Sep 17 00:00:00 2001 From: Timofei Larkin Date: Thu, 1 May 2025 13:05:10 +0300 Subject: [PATCH] Capture all resources by WorkloadMonitors Signed-off-by: Timofei Larkin --- .../http-cache/templates/workloadmonitor.yaml | 39 +++++++++++++++++++ packages/apps/mysql/templates/mariadb.yaml | 5 +++ packages/apps/postgres/templates/db.yaml | 6 ++- .../apps/redis/templates/redisfailover.yaml | 3 ++ 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 packages/apps/http-cache/templates/workloadmonitor.yaml diff --git a/packages/apps/http-cache/templates/workloadmonitor.yaml b/packages/apps/http-cache/templates/workloadmonitor.yaml new file mode 100644 index 00000000..150d8bbe --- /dev/null +++ b/packages/apps/http-cache/templates/workloadmonitor.yaml @@ -0,0 +1,39 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }}-haproxy +spec: + replicas: {{ .Values.haproxy.replicas }} + minReplicas: 1 + kind: http-cache + type: http-cache + selector: + app: {{ $.Release.Name }}-haproxy + version: {{ $.Chart.Version }} +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }}-nginx +spec: + replicas: {{ .Values.nginx.replicas }} + minReplicas: 1 + kind: http-cache + type: http-cache + selector: + app: {{ $.Release.Name }}-nginx-cache + version: {{ $.Chart.Version }} +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: http-cache + type: http-cache + selector: + app.kubernetes.io/instance: {{ $.Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/mysql/templates/mariadb.yaml b/packages/apps/mysql/templates/mariadb.yaml index 68d22f85..e9535883 100644 --- a/packages/apps/mysql/templates/mariadb.yaml +++ b/packages/apps/mysql/templates/mariadb.yaml @@ -57,6 +57,11 @@ spec: name: {{ .Release.Name }}-my-cnf key: config + service: + metadata: + labels: + app.kubernetes.io/instance: {{ $.Release.Name }} + storage: size: {{ .Values.size }} resizeInUseVolumes: true diff --git a/packages/apps/postgres/templates/db.yaml b/packages/apps/postgres/templates/db.yaml index 9de84d1d..6e7ede2e 100644 --- a/packages/apps/postgres/templates/db.yaml +++ b/packages/apps/postgres/templates/db.yaml @@ -41,6 +41,8 @@ spec: inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" + app.kubernetes.io/name: postgres.apps.cozystack.io + app.kubernets.io/instance: {{ $.Release.Name }} --- apiVersion: cozystack.io/v1alpha1 kind: WorkloadMonitor @@ -52,6 +54,6 @@ spec: kind: postgres type: postgres selector: - cnpg.io/cluster: {{ .Release.Name }} - cnpg.io/podRole: instance + app.kubernetes.io/name: postgres.apps.cozystack.io + app.kubernets.io/instance: {{ $.Release.Name }} version: {{ $.Chart.Version }} diff --git a/packages/apps/redis/templates/redisfailover.yaml b/packages/apps/redis/templates/redisfailover.yaml index fddda39a..5a5bfd4a 100644 --- a/packages/apps/redis/templates/redisfailover.yaml +++ b/packages/apps/redis/templates/redisfailover.yaml @@ -42,6 +42,9 @@ spec: persistentVolumeClaim: metadata: name: redisfailover-persistent-data + labels: + app.kubernetes.io/component: redis + app.kubernetes.io/instance: {{ $.Release.Name }} spec: accessModes: - ReadWriteOnce