From 65e1daf1db82ddaf791e9cfeac7da4227d908976 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 2 Feb 2024 10:21:10 +0100 Subject: [PATCH] upd namespace labels --- packages/apps/tenant/templates/etcd.yaml | 2 +- packages/apps/tenant/templates/ingress.yaml | 2 +- .../apps/tenant/templates/monitoring.yaml | 2 +- packages/apps/tenant/templates/namespace.yaml | 29 +++++++++++++++++++ packages/apps/tenant/templates/tenant.yaml | 19 ------------ packages/apps/tenant/values.schema.json | 6 ++-- packages/apps/tenant/values.yaml | 6 ++-- packages/core/installer/images/installer.json | 6 ++-- packages/core/platform/templates/apps.yaml | 11 +++++++ packages/core/platform/values.yaml | 1 - 10 files changed, 52 insertions(+), 32 deletions(-) create mode 100644 packages/apps/tenant/templates/namespace.yaml diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml index 88d716dd..4bf9c0be 100644 --- a/packages/apps/tenant/templates/etcd.yaml +++ b/packages/apps/tenant/templates/etcd.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ownEtcd }} +{{- if .Values.etcd }} apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml index a29fc3da..60d3c81d 100644 --- a/packages/apps/tenant/templates/ingress.yaml +++ b/packages/apps/tenant/templates/ingress.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ownIngress }} +{{- if .Values.ingress }} apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml index 2d75585b..1d621fd0 100644 --- a/packages/apps/tenant/templates/monitoring.yaml +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ownMonitoring }} +{{- if .Values.monitoring }} apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/packages/apps/tenant/templates/namespace.yaml b/packages/apps/tenant/templates/namespace.yaml new file mode 100644 index 00000000..e78f3d1c --- /dev/null +++ b/packages/apps/tenant/templates/namespace.yaml @@ -0,0 +1,29 @@ +{{- if ne (include "tenant.name" .) "tenant-root" }} +--- +apiVersion: v1 +kind: Namespace +metadata: + name: {{ include "tenant.name" . }} + {{- if hasPrefix "tenant-" .Release.Namespace }} + {{- $existingNS := lookup "v1" "Namespace" "" .Release.Namespace }} + {{- if $existingNS }} + labels: + {{- range $x := list "etcd" "monitoring" "ingress" }} + {{- if (index $.Values $x) }} + namespace.cozystack.io/{{ $x }}: "{{ include "tenant.name" $ }}" + {{- else }} + namespace.cozystack.io/{{ $x }}: "{{ index $existingNS.metadata.labels (printf "namespace.cozystack.io/%s" $x) | required (printf "namespace %s has no namespace.cozystack.io/%s label" $.Release.Namespace $x) }}" + {{- end }} + {{- end }} + ownerReferences: + - apiVersion: v1 + blockOwnerDeletion: true + controller: true + kind: Namespace + name: {{ .Release.Namespace }} + uid: {{ $existingNS.metadata.uid }} + {{- else }} + {{- fail (printf "error lookup exiting namespace: %s" .Release.Namespace) }} + {{- end }} + {{- end }} +{{- end }} diff --git a/packages/apps/tenant/templates/tenant.yaml b/packages/apps/tenant/templates/tenant.yaml index 9f2225e8..1e46b353 100644 --- a/packages/apps/tenant/templates/tenant.yaml +++ b/packages/apps/tenant/templates/tenant.yaml @@ -1,22 +1,3 @@ -{{- if ne (include "tenant.name" .) "tenant-root" }} ---- -apiVersion: v1 -kind: Namespace -metadata: - name: {{ include "tenant.name" . }} - {{- if hasPrefix "tenant-" .Release.Namespace }} - {{- $existingNS := lookup "v1" "Namespace" "" .Release.Namespace }} - {{- if $existingNS }} - ownerReferences: - - apiVersion: v1 - blockOwnerDeletion: true - controller: true - kind: Namespace - name: {{ .Release.Namespace }} - uid: {{ $existingNS.metadata.uid }} - {{- end }} - {{- end }} -{{- end }} --- apiVersion: v1 kind: ServiceAccount diff --git a/packages/apps/tenant/values.schema.json b/packages/apps/tenant/values.schema.json index f2c7958a..4eb97d67 100644 --- a/packages/apps/tenant/values.schema.json +++ b/packages/apps/tenant/values.schema.json @@ -2,17 +2,17 @@ "$schema": "http://json-schema.org/schema#", "type": "object", "properties": { - "ownEtcd": { + "etcd": { "type": "boolean", "title": "Deploy own Etcd cluster", "form": true }, - "ownMonitoring": { + "monitoring": { "type": "boolean", "title": "Deploy own Monitoring Stack", "form": true }, - "ownIngress": { + "ingress": { "type": "boolean", "title": "Deploy own Ingress Controller", "form": true diff --git a/packages/apps/tenant/values.yaml b/packages/apps/tenant/values.yaml index 3f1354e2..a356ce7b 100644 --- a/packages/apps/tenant/values.yaml +++ b/packages/apps/tenant/values.yaml @@ -1,3 +1,3 @@ -ownEtcd: false -ownMonitoring: false -ownIngress: false +etcd: false +monitoring: false +ingress: false diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json index beda6628..bac1c393 100644 --- a/packages/core/installer/images/installer.json +++ b/packages/core/installer/images/installer.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:b95413eef3300e5b5d71499df490b708388ef4629bc0f627fa7ccfb868742b8b", + "containerimage.config.digest": "sha256:d7884d6ecb6194f1bd76f60317cc4c74b606c1db542b92559058af4ea6a4ac6a", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:db7bb15121fc3bad03f4dc6be4ec8ebcefb869f26abcd9b0e3c89f1e3b54a618", + "digest": "sha256:454b0acf089e63f508d27fed62a96a237f6df73a593f14ef9c3db8954281ee66", "size": 2074, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:db7bb15121fc3bad03f4dc6be4ec8ebcefb869f26abcd9b0e3c89f1e3b54a618", + "containerimage.digest": "sha256:454b0acf089e63f508d27fed62a96a237f6df73a593f14ef9c3db8954281ee66", "image.name": "ghcr.io/aenix-io/cozystack/installer:latest" } \ No newline at end of file diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml index 3b2d6ec9..b76e6461 100644 --- a/packages/core/platform/templates/apps.yaml +++ b/packages/core/platform/templates/apps.yaml @@ -1,4 +1,15 @@ --- +apiVersion: v1 +kind: Namespace +metadata: + annotations: + helm.sh/resource-policy: keep + labels: + namespace.cozystack.io/etcd: tenant-root + namespace.cozystack.io/monitoring: tenant-root + namespace.cozystack.io/ingress: tenant-root + name: tenant-root +--- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/packages/core/platform/values.yaml b/packages/core/platform/values.yaml index dfc11350..1cf1f8a3 100644 --- a/packages/core/platform/values.yaml +++ b/packages/core/platform/values.yaml @@ -29,4 +29,3 @@ namespaces: - name: cozy-redis-operator - name: cozy-telepresence - name: cozy-victoria-metrics-operator -- name: tenant-root