From dd16b8f27f04c2911fd3c48e8ba7142471273ac2 Mon Sep 17 00:00:00 2001 From: kklinch0 Date: Sat, 5 Jul 2025 12:42:55 +0300 Subject: [PATCH 1/2] vm add svc to dashboard Signed-off-by: kklinch0 --- packages/apps/tenant/Chart.yaml | 2 +- packages/apps/tenant/templates/etcd.yaml | 2 -- packages/apps/tenant/templates/ingress.yaml | 2 -- packages/apps/tenant/templates/monitoring.yaml | 2 -- packages/apps/tenant/templates/seaweedfs.yaml | 2 -- packages/apps/versions_map | 3 ++- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml index b11ee15c..0839086b 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.11.0 +version: 1.11.1 diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml index 17b66683..7bd49582 100644 --- a/packages/apps/tenant/templates/etcd.yaml +++ b/packages/apps/tenant/templates/etcd.yaml @@ -4,8 +4,6 @@ kind: HelmRelease metadata: name: etcd namespace: {{ include "tenant.name" . }} - annotations: - helm.sh/resource-policy: keep labels: cozystack.io/ui: "true" app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml index b93ae0fa..5d3cb05f 100644 --- a/packages/apps/tenant/templates/ingress.yaml +++ b/packages/apps/tenant/templates/ingress.yaml @@ -4,8 +4,6 @@ kind: HelmRelease metadata: name: ingress namespace: {{ include "tenant.name" . }} - annotations: - helm.sh/resource-policy: keep labels: cozystack.io/ui: "true" app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index e62cb507..9bec723b 100644 --- a/packages/apps/tenant/templates/monitoring.yaml +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -4,8 +4,6 @@ kind: HelmRelease metadata: name: monitoring namespace: {{ include "tenant.name" . }} - annotations: - helm.sh/resource-policy: keep labels: cozystack.io/ui: "true" app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml index 5741d930..9cc0b225 100644 --- a/packages/apps/tenant/templates/seaweedfs.yaml +++ b/packages/apps/tenant/templates/seaweedfs.yaml @@ -4,8 +4,6 @@ kind: HelmRelease metadata: name: seaweedfs namespace: {{ include "tenant.name" . }} - annotations: - helm.sh/resource-policy: keep labels: cozystack.io/ui: "true" app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 6372e513..42464878 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -135,7 +135,8 @@ tcp-balancer 0.4.1 62cb694d tcp-balancer 0.4.2 4369b031 tcp-balancer 0.5.0 HEAD tenant 1.10.0 4369b031 -tenant 1.11.0 HEAD +tenant 1.11.0 70f82667 +tenant 1.11.1 HEAD virtual-machine 0.1.4 f2015d65 virtual-machine 0.1.5 263e47be virtual-machine 0.2.0 c0685f43 From 379e0da6d2e02f00ebf68ca756a537a6cb1884f6 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Sat, 19 Jul 2025 03:41:56 +0200 Subject: [PATCH 2/2] Remove default values Signed-off-by: Andrei Kvapil --- packages/apps/tenant/templates/etcd.yaml | 1 - packages/apps/tenant/templates/info.yaml | 3 --- .../apps/tenant/templates/monitoring.yaml | 25 ------------------- packages/apps/tenant/templates/seaweedfs.yaml | 1 - 4 files changed, 30 deletions(-) diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml index 7bd49582..1a8e4006 100644 --- a/packages/apps/tenant/templates/etcd.yaml +++ b/packages/apps/tenant/templates/etcd.yaml @@ -17,7 +17,6 @@ spec: kind: HelmRepository name: cozystack-extra namespace: cozy-public - version: "*" interval: 1m0s timeout: 5m0s {{- end }} diff --git a/packages/apps/tenant/templates/info.yaml b/packages/apps/tenant/templates/info.yaml index 08e32329..f2d090ce 100644 --- a/packages/apps/tenant/templates/info.yaml +++ b/packages/apps/tenant/templates/info.yaml @@ -6,8 +6,6 @@ kind: HelmRelease metadata: name: info namespace: {{ include "tenant.name" . }} - annotations: - helm.sh/resource-policy: keep labels: cozystack.io/ui: "true" app.kubernetes.io/instance: {{ .Release.Name }} @@ -21,7 +19,6 @@ spec: kind: HelmRepository name: cozystack-extra namespace: cozy-public - version: "*" interval: 1m0s timeout: 5m0s {{- end }} diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index 9bec723b..1992a4ea 100644 --- a/packages/apps/tenant/templates/monitoring.yaml +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -17,31 +17,6 @@ spec: kind: HelmRepository name: cozystack-extra namespace: cozy-public - version: "*" interval: 1m0s timeout: 5m0s - values: - metricsStorages: - - name: shortterm - retentionPeriod: "3d" - deduplicationInterval: "15s" - storage: 10Gi - vminsert: - resources: {} - vmselect: - resources: {} - vmstorage: - resources: {} - - name: longterm - retentionPeriod: "14d" - deduplicationInterval: "5m" - storage: 10Gi - vminsert: - resources: {} - vmselect: - resources: {} - vmstorage: - resources: {} - oncall: - enabled: false {{- end }} diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml index 9cc0b225..aa579b3e 100644 --- a/packages/apps/tenant/templates/seaweedfs.yaml +++ b/packages/apps/tenant/templates/seaweedfs.yaml @@ -17,7 +17,6 @@ spec: kind: HelmRepository name: cozystack-extra namespace: cozy-public - version: "*" interval: 1m0s timeout: 5m0s {{- end }}