From 2bf312260dfa89fe5a8ef50d52f20e9b0bf85249 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Tue, 22 Apr 2025 19:51:24 +0200 Subject: [PATCH] [platform] make apps and extra applications to load hash tenant config Signed-off-by: Andrei Kvapil --- packages/apps/bucket/Chart.yaml | 2 +- packages/apps/bucket/Makefile | 2 +- packages/apps/bucket/templates/helmrelease.yaml | 6 ++++++ packages/apps/nats/Chart.yaml | 2 +- packages/apps/nats/templates/nats.yaml | 6 ++++++ packages/apps/tenant/Chart.yaml | 2 +- packages/apps/tenant/templates/etcd.yaml | 6 ++++++ packages/apps/tenant/templates/info.yaml | 6 ++++++ packages/apps/tenant/templates/ingress.yaml | 6 ++++++ packages/apps/tenant/templates/monitoring.yaml | 8 ++++++-- packages/apps/tenant/templates/seaweedfs.yaml | 6 ++++++ packages/apps/versions_map | 9 ++++++--- packages/extra/ingress/Chart.yaml | 2 +- packages/extra/ingress/templates/nginx-ingress.yaml | 6 ++++++ packages/extra/seaweedfs/Chart.yaml | 2 +- packages/extra/seaweedfs/templates/seaweedfs.yaml | 6 ++++++ packages/extra/versions_map | 6 ++++-- 17 files changed, 70 insertions(+), 13 deletions(-) diff --git a/packages/apps/bucket/Chart.yaml b/packages/apps/bucket/Chart.yaml index 94b33a62..a229868a 100644 --- a/packages/apps/bucket/Chart.yaml +++ b/packages/apps/bucket/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.1.0 +version: 0.2.0 # 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/bucket/Makefile b/packages/apps/bucket/Makefile index 264adfcf..30effdbd 100644 --- a/packages/apps/bucket/Makefile +++ b/packages/apps/bucket/Makefile @@ -1,4 +1,4 @@ include ../../../scripts/package.mk generate: - readme-generator -v values.yaml -s values.schema.json -r README.md + #readme-generator -v values.yaml -s values.schema.json -r README.md diff --git a/packages/apps/bucket/templates/helmrelease.yaml b/packages/apps/bucket/templates/helmrelease.yaml index ac014e03..5db1d736 100644 --- a/packages/apps/bucket/templates/helmrelease.yaml +++ b/packages/apps/bucket/templates/helmrelease.yaml @@ -16,3 +16,9 @@ spec: timeout: 5m0s values: bucketName: {{ .Release.Name }} + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash diff --git a/packages/apps/nats/Chart.yaml b/packages/apps/nats/Chart.yaml index 2bae5c73..38f429fb 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.5.0 +version: 0.6.0 # 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/nats.yaml b/packages/apps/nats/templates/nats.yaml index 019c7984..15cc008f 100644 --- a/packages/apps/nats/templates/nats.yaml +++ b/packages/apps/nats/templates/nats.yaml @@ -95,3 +95,9 @@ spec: spec: type: LoadBalancer {{- end }} + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml index bba14724..555af0ab 100644 --- a/packages/apps/tenant/Chart.yaml +++ b/packages/apps/tenant/Chart.yaml @@ -4,4 +4,4 @@ description: Separated tenant namespace icon: /logos/tenant.svg type: application -version: 1.9.1 +version: 1.10.0 diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml index 17b66683..091d0094 100644 --- a/packages/apps/tenant/templates/etcd.yaml +++ b/packages/apps/tenant/templates/etcd.yaml @@ -22,4 +22,10 @@ spec: version: "*" interval: 1m0s timeout: 5m0s + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash {{- end }} diff --git a/packages/apps/tenant/templates/info.yaml b/packages/apps/tenant/templates/info.yaml index 08e32329..e98358ff 100644 --- a/packages/apps/tenant/templates/info.yaml +++ b/packages/apps/tenant/templates/info.yaml @@ -24,4 +24,10 @@ spec: version: "*" interval: 1m0s timeout: 5m0s + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash {{- end }} diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml index b93ae0fa..510c6b18 100644 --- a/packages/apps/tenant/templates/ingress.yaml +++ b/packages/apps/tenant/templates/ingress.yaml @@ -23,4 +23,10 @@ spec: interval: 1m0s timeout: 5m0s values: {} + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash {{- end }} diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index e62cb507..167a2df1 100644 --- a/packages/apps/tenant/templates/monitoring.yaml +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -44,6 +44,10 @@ spec: resources: {} vmstorage: resources: {} - oncall: - enabled: false + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash {{- end }} diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml index 5741d930..686c3ec2 100644 --- a/packages/apps/tenant/templates/seaweedfs.yaml +++ b/packages/apps/tenant/templates/seaweedfs.yaml @@ -22,4 +22,10 @@ spec: version: "*" interval: 1m0s timeout: 5m0s + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash {{- end }} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index a1175417..aad6d4c5 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -1,4 +1,5 @@ -bucket 0.1.0 HEAD +bucket 0.1.0 721c12a7 +bucket 0.2.0 HEAD clickhouse 0.1.0 f7eaab0a clickhouse 0.2.0 53f2365e clickhouse 0.2.1 dfbc210b @@ -75,7 +76,8 @@ nats 0.3.0 78366f19 nats 0.3.1 c62a83a7 nats 0.4.0 898374b5 nats 0.4.1 8267072d -nats 0.5.0 HEAD +nats 0.5.0 721c12a7 +nats 0.6.0 HEAD postgres 0.1.0 263e47be postgres 0.2.0 53f2365e postgres 0.2.1 d7cfa53c @@ -130,7 +132,8 @@ tenant 1.6.8 bc95159a tenant 1.7.0 24fa7222 tenant 1.8.0 160e4e2a tenant 1.9.0 728743db -tenant 1.9.1 HEAD +tenant 1.9.1 721c12a7 +tenant 1.10.0 HEAD virtual-machine 0.1.4 f2015d65 virtual-machine 0.1.5 263e47be virtual-machine 0.2.0 c0685f43 diff --git a/packages/extra/ingress/Chart.yaml b/packages/extra/ingress/Chart.yaml index d9524db2..25d86de0 100644 --- a/packages/extra/ingress/Chart.yaml +++ b/packages/extra/ingress/Chart.yaml @@ -3,4 +3,4 @@ name: ingress description: NGINX Ingress Controller icon: /logos/ingress-nginx.svg type: application -version: 1.4.0 +version: 1.5.0 diff --git a/packages/extra/ingress/templates/nginx-ingress.yaml b/packages/extra/ingress/templates/nginx-ingress.yaml index d0b67be4..d2f2ebe6 100644 --- a/packages/extra/ingress/templates/nginx-ingress.yaml +++ b/packages/extra/ingress/templates/nginx-ingress.yaml @@ -51,3 +51,9 @@ spec: server-snippet: "real_ip_header CF-Connecting-IP;" {{- end }} {{- end }} + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash diff --git a/packages/extra/seaweedfs/Chart.yaml b/packages/extra/seaweedfs/Chart.yaml index 39114925..233b0c8b 100644 --- a/packages/extra/seaweedfs/Chart.yaml +++ b/packages/extra/seaweedfs/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.5.0 # 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/extra/seaweedfs/templates/seaweedfs.yaml b/packages/extra/seaweedfs/templates/seaweedfs.yaml index b9846aa1..20fd4ff9 100644 --- a/packages/extra/seaweedfs/templates/seaweedfs.yaml +++ b/packages/extra/seaweedfs/templates/seaweedfs.yaml @@ -82,6 +82,12 @@ spec: limits: cpu: "500m" memory: "512Mi" + valuesFrom: + - kind: ConfigMap + name: cozy-tenant-configuration-hash + optional: true + targetPath: cozyTenantConfigurationHash + valuesKey: cozyTenantConfigurationHash --- apiVersion: cozystack.io/v1alpha1 kind: WorkloadMonitor diff --git a/packages/extra/versions_map b/packages/extra/versions_map index d4ee1e2c..bdc4fd48 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -16,7 +16,8 @@ ingress 1.0.0 d7cfa53c ingress 1.1.0 5bbc488e ingress 1.2.0 28fca4ef ingress 1.3.0 fde4bcfa -ingress 1.4.0 HEAD +ingress 1.4.0 721c12a7 +ingress 1.5.0 HEAD monitoring 1.0.0 d7cfa53c monitoring 1.1.0 25221fdc monitoring 1.2.0 f81be075 @@ -40,4 +41,5 @@ seaweedfs 0.1.0 71514249 seaweedfs 0.2.0 5fb9cfe3 seaweedfs 0.2.1 fde4bcfa seaweedfs 0.3.0 45a7416c -seaweedfs 0.4.0 HEAD +seaweedfs 0.4.0 721c12a7 +seaweedfs 0.5.0 HEAD