From 0793b1eaf6367ad6c702e7f39542c19c6a416770 Mon Sep 17 00:00:00 2001 From: kklinch0 Date: Wed, 5 Mar 2025 12:15:23 +0300 Subject: [PATCH] feature/add-workload-monitors --- packages/apps/clickhouse/Chart.yaml | 2 +- .../templates/dashboard-resourcemap.yaml | 7 +++++ .../clickhouse/templates/workloadmonitor.yaml | 13 ++++++++ packages/apps/ferretdb/Chart.yaml | 2 +- .../templates/dashboard-resourcemap.yaml | 7 +++++ .../ferretdb/templates/workloadmonitor.yaml | 13 ++++++++ packages/apps/kafka/Chart.yaml | 2 +- .../templates/dashboard-resourcemap.yaml | 8 +++++ .../apps/kafka/templates/workloadmonitor.yaml | 30 +++++++++++++++++++ packages/apps/mysql/Chart.yaml | 2 +- .../templates/dashboard-resourcemap.yaml | 7 +++++ .../apps/mysql/templates/workloadmonitor.yaml | 13 ++++++++ packages/apps/nats/Chart.yaml | 2 +- packages/apps/nats/templates/resourcemap.yaml | 7 +++++ .../apps/nats/templates/workloadmonitor.yaml | 13 ++++++++ packages/apps/rabbitmq/Chart.yaml | 2 +- .../templates/dashboard-resourcemap.yaml | 7 +++++ .../rabbitmq/templates/workloadmonitor.yaml | 13 ++++++++ packages/apps/versions_map | 18 +++++++---- 19 files changed, 156 insertions(+), 12 deletions(-) create mode 100644 packages/apps/clickhouse/templates/workloadmonitor.yaml create mode 100644 packages/apps/ferretdb/templates/workloadmonitor.yaml create mode 100644 packages/apps/kafka/templates/workloadmonitor.yaml create mode 100644 packages/apps/mysql/templates/workloadmonitor.yaml create mode 100644 packages/apps/nats/templates/workloadmonitor.yaml create mode 100644 packages/apps/rabbitmq/templates/workloadmonitor.yaml diff --git a/packages/apps/clickhouse/Chart.yaml b/packages/apps/clickhouse/Chart.yaml index f5b6a528..ee79a67a 100644 --- a/packages/apps/clickhouse/Chart.yaml +++ b/packages/apps/clickhouse/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.1 +version: 0.6.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/clickhouse/templates/dashboard-resourcemap.yaml b/packages/apps/clickhouse/templates/dashboard-resourcemap.yaml index 3c4f019b..94852e9a 100644 --- a/packages/apps/clickhouse/templates/dashboard-resourcemap.yaml +++ b/packages/apps/clickhouse/templates/dashboard-resourcemap.yaml @@ -17,3 +17,10 @@ rules: resourceNames: - {{ .Release.Name }}-credentials verbs: ["get", "list", "watch"] +- apiGroups: + - cozystack.io + resources: + - workloadmonitors + resourceNames: + - {{ .Release.Name }} + verbs: ["get", "list", "watch"] diff --git a/packages/apps/clickhouse/templates/workloadmonitor.yaml b/packages/apps/clickhouse/templates/workloadmonitor.yaml new file mode 100644 index 00000000..9ddd576e --- /dev/null +++ b/packages/apps/clickhouse/templates/workloadmonitor.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: clickhouse + type: clickhouse + selector: + clickhouse.altinity.com/chi: {{ $.Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/ferretdb/Chart.yaml b/packages/apps/ferretdb/Chart.yaml index 0b8fc993..b1542bcd 100644 --- a/packages/apps/ferretdb/Chart.yaml +++ b/packages/apps/ferretdb/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.1 +version: 0.4.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/ferretdb/templates/dashboard-resourcemap.yaml b/packages/apps/ferretdb/templates/dashboard-resourcemap.yaml index a91a54ac..e8fb6c2e 100644 --- a/packages/apps/ferretdb/templates/dashboard-resourcemap.yaml +++ b/packages/apps/ferretdb/templates/dashboard-resourcemap.yaml @@ -17,3 +17,10 @@ rules: resourceNames: - {{ .Release.Name }}-credentials verbs: ["get", "list", "watch"] +- apiGroups: + - cozystack.io + resources: + - workloadmonitors + resourceNames: + - {{ .Release.Name }} + verbs: ["get", "list", "watch"] diff --git a/packages/apps/ferretdb/templates/workloadmonitor.yaml b/packages/apps/ferretdb/templates/workloadmonitor.yaml new file mode 100644 index 00000000..96e7d87e --- /dev/null +++ b/packages/apps/ferretdb/templates/workloadmonitor.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: ferretdb + type: ferretdb + selector: + app: {{ $.Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/kafka/Chart.yaml b/packages/apps/kafka/Chart.yaml index ec425b02..2f378d02 100644 --- a/packages/apps/kafka/Chart.yaml +++ b/packages/apps/kafka/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.3.2 +version: 0.3.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/kafka/templates/dashboard-resourcemap.yaml b/packages/apps/kafka/templates/dashboard-resourcemap.yaml index 7222c152..ba91ccad 100644 --- a/packages/apps/kafka/templates/dashboard-resourcemap.yaml +++ b/packages/apps/kafka/templates/dashboard-resourcemap.yaml @@ -17,3 +17,11 @@ rules: resourceNames: - {{ .Release.Name }}-clients-ca verbs: ["get", "list", "watch"] +- apiGroups: + - cozystack.io + resources: + - workloadmonitors + resourceNames: + - {{ .Release.Name }} + - {{ $.Release.Name }}-zookeeper + verbs: ["get", "list", "watch"] diff --git a/packages/apps/kafka/templates/workloadmonitor.yaml b/packages/apps/kafka/templates/workloadmonitor.yaml new file mode 100644 index 00000000..4b161b04 --- /dev/null +++ b/packages/apps/kafka/templates/workloadmonitor.yaml @@ -0,0 +1,30 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: kafka + type: kafka + selector: + app.kubernetes.io/instance: {{ $.Release.Name }} + app.kubernetes.io/name: kafka + version: {{ $.Chart.Version }} + +--- + +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }}-zookeeper +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: kafka + type: zookeeper + selector: + app.kubernetes.io/instance: {{ $.Release.Name }} + app.kubernetes.io/name: zookeeper + version: {{ $.Chart.Version }} diff --git a/packages/apps/mysql/Chart.yaml b/packages/apps/mysql/Chart.yaml index f03a4f85..4009b7ef 100644 --- a/packages/apps/mysql/Chart.yaml +++ b/packages/apps/mysql/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.2 +version: 0.5.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/mysql/templates/dashboard-resourcemap.yaml b/packages/apps/mysql/templates/dashboard-resourcemap.yaml index 7ed74101..4093cde1 100644 --- a/packages/apps/mysql/templates/dashboard-resourcemap.yaml +++ b/packages/apps/mysql/templates/dashboard-resourcemap.yaml @@ -18,3 +18,10 @@ rules: resourceNames: - {{ .Release.Name }}-credentials verbs: ["get", "list", "watch"] +- apiGroups: + - cozystack.io + resources: + - workloadmonitors + resourceNames: + - {{ .Release.Name }} + verbs: ["get", "list", "watch"] diff --git a/packages/apps/mysql/templates/workloadmonitor.yaml b/packages/apps/mysql/templates/workloadmonitor.yaml new file mode 100644 index 00000000..9fc6d144 --- /dev/null +++ b/packages/apps/mysql/templates/workloadmonitor.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: mysql + type: mysql + selector: + app.kubernetes.io/instance: {{ $.Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/nats/Chart.yaml b/packages/apps/nats/Chart.yaml index 02b9fa18..346740bf 100644 --- a/packages/apps/nats/Chart.yaml +++ b/packages/apps/nats/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.4.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/nats/templates/resourcemap.yaml b/packages/apps/nats/templates/resourcemap.yaml index a91a54ac..e8fb6c2e 100644 --- a/packages/apps/nats/templates/resourcemap.yaml +++ b/packages/apps/nats/templates/resourcemap.yaml @@ -17,3 +17,10 @@ rules: resourceNames: - {{ .Release.Name }}-credentials verbs: ["get", "list", "watch"] +- apiGroups: + - cozystack.io + resources: + - workloadmonitors + resourceNames: + - {{ .Release.Name }} + verbs: ["get", "list", "watch"] diff --git a/packages/apps/nats/templates/workloadmonitor.yaml b/packages/apps/nats/templates/workloadmonitor.yaml new file mode 100644 index 00000000..43d64a46 --- /dev/null +++ b/packages/apps/nats/templates/workloadmonitor.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: nats + type: nats + selector: + app.kubernetes.io/instance: {{ $.Release.Name }}-system + version: {{ $.Chart.Version }} diff --git a/packages/apps/rabbitmq/Chart.yaml b/packages/apps/rabbitmq/Chart.yaml index eaab0c42..60a0f028 100644 --- a/packages/apps/rabbitmq/Chart.yaml +++ b/packages/apps/rabbitmq/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.3 +version: 0.4.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml b/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml index a85dc212..6a7aee79 100644 --- a/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml +++ b/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml @@ -20,3 +20,10 @@ rules: resourceNames: - {{ .Release.Name }} verbs: ["get", "list", "watch"] +- apiGroups: + - cozystack.io + resources: + - workloadmonitors + resourceNames: + - {{ .Release.Name }} + verbs: ["get", "list", "watch"] diff --git a/packages/apps/rabbitmq/templates/workloadmonitor.yaml b/packages/apps/rabbitmq/templates/workloadmonitor.yaml new file mode 100644 index 00000000..0f7462c7 --- /dev/null +++ b/packages/apps/rabbitmq/templates/workloadmonitor.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: rabbitmq + type: rabbitmq + selector: + app.kubernetes.io/name: {{ $.Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 18aa5dac..610ea9e2 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -6,13 +6,15 @@ clickhouse 0.3.0 b00621e clickhouse 0.4.0 320fc32 clickhouse 0.5.0 2a4768a5 clickhouse 0.6.0 18bbdb67 -clickhouse 0.6.1 HEAD +clickhouse 0.6.1 b7375f73 +clickhouse 0.6.2 HEAD ferretdb 0.1.0 4ffa8615 ferretdb 0.1.1 5ca8823 ferretdb 0.2.0 adaf603 ferretdb 0.3.0 aa2f553 ferretdb 0.4.0 def2eb0f -ferretdb 0.4.1 HEAD +ferretdb 0.4.1 a9555210 +ferretdb 0.4.2 HEAD http-cache 0.1.0 a956713 http-cache 0.2.0 5ca8823 http-cache 0.3.0 fab5940 @@ -24,7 +26,8 @@ kafka 0.2.2 d0758692 kafka 0.2.3 5ca8823 kafka 0.3.0 c07c4bbd kafka 0.3.1 b7375f73 -kafka 0.3.2 HEAD +kafka 0.3.2 b75aaf17 +kafka 0.3.3 HEAD kubernetes 0.1.0 f642698 kubernetes 0.2.0 7cd7de73 kubernetes 0.3.0 7caccec1 @@ -52,12 +55,14 @@ mysql 0.3.0 5ca8823 mysql 0.4.0 93018c4 mysql 0.5.0 4b84798 mysql 0.5.1 fab5940b -mysql 0.5.2 HEAD +mysql 0.5.2 d8a92aa3 +mysql 0.5.3 HEAD nats 0.1.0 5ca8823 nats 0.2.0 c07c4bbd nats 0.3.0 78366f19 nats 0.3.1 b7375f73 -nats 0.4.0 HEAD +nats 0.4.0 da1e705a +nats 0.4.1 HEAD postgres 0.1.0 f642698 postgres 0.2.0 7cd7de73 postgres 0.2.1 4a97e297 @@ -77,7 +82,8 @@ rabbitmq 0.3.0 9e33dc0 rabbitmq 0.4.0 36d8855 rabbitmq 0.4.1 35536bb rabbitmq 0.4.2 00b2834e -rabbitmq 0.4.3 HEAD +rabbitmq 0.4.3 d8a92aa3 +rabbitmq 0.4.4 HEAD redis 0.1.1 f642698 redis 0.2.0 5ca8823 redis 0.3.0 c07c4bbd