From 07a29a5d22eae9be68fd9d9da141b3fa83f9f5d2 Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Thu, 11 Sep 2025 17:52:29 +0200 Subject: [PATCH 1/4] Adding dev vars folder --- vars/tenant-tpl-dev/dev-example.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 vars/tenant-tpl-dev/dev-example.yaml diff --git a/vars/tenant-tpl-dev/dev-example.yaml b/vars/tenant-tpl-dev/dev-example.yaml new file mode 100644 index 0000000..8b83b7d --- /dev/null +++ b/vars/tenant-tpl-dev/dev-example.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: example-vars-dev +data: + EXAMPLE: foo-dev From da62cfe43435eb0f63ff4d0a527dfc65b9dfec5d Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Mon, 15 Sep 2025 13:00:09 +0200 Subject: [PATCH 2/4] Adding Patching overlays --- echo-server/{app => base}/helmrelease.yaml | 0 echo-server/ks.yaml | 22 ++++++++++++++++++- .../tenant-tpl-dev/kustomization.yaml | 5 +++++ .../tenant-tpl-dev/patch-replicas.yaml | 10 +++++++++ .../overlays/tenant-tpl/kustomization.yaml | 5 +++++ .../overlays/tenant-tpl/patch-resources.yaml | 17 ++++++++++++++ 6 files changed, 58 insertions(+), 1 deletion(-) rename echo-server/{app => base}/helmrelease.yaml (100%) create mode 100644 echo-server/overlays/tenant-tpl-dev/kustomization.yaml create mode 100644 echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml create mode 100644 echo-server/overlays/tenant-tpl/kustomization.yaml create mode 100644 echo-server/overlays/tenant-tpl/patch-resources.yaml diff --git a/echo-server/app/helmrelease.yaml b/echo-server/base/helmrelease.yaml similarity index 100% rename from echo-server/app/helmrelease.yaml rename to echo-server/base/helmrelease.yaml diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml index 4448636..f293297 100644 --- a/echo-server/ks.yaml +++ b/echo-server/ks.yaml @@ -9,7 +9,27 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./echo-server/app + path: ./echo-server/base + prune: true + sourceRef: + kind: GitRepository + name: tenant-repos + wait: false + interval: 30m + retryInterval: 1m + timeout: 5m +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: &app echo-server-overlays + namespace: ${TENANT_NAMESPACE} +spec: + commonMetadata: + labels: + app.kubernetes.io/name: *app + path: ./echo-server/overlays/${TENANT_NAMESPACE} prune: true sourceRef: kind: GitRepository diff --git a/echo-server/overlays/tenant-tpl-dev/kustomization.yaml b/echo-server/overlays/tenant-tpl-dev/kustomization.yaml new file mode 100644 index 0000000..f4ce706 --- /dev/null +++ b/echo-server/overlays/tenant-tpl-dev/kustomization.yaml @@ -0,0 +1,5 @@ +resources: + - ../../base + +patchesStrategicMerge: + - patch-replicas.yaml diff --git a/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml b/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml new file mode 100644 index 0000000..20ab7f6 --- /dev/null +++ b/echo-server/overlays/tenant-tpl-dev/patch-replicas.yaml @@ -0,0 +1,10 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: echo-server +spec: + values: + controllers: + echo-server: + replicas: 5 # increase replicas for dev + diff --git a/echo-server/overlays/tenant-tpl/kustomization.yaml b/echo-server/overlays/tenant-tpl/kustomization.yaml new file mode 100644 index 0000000..e6474d2 --- /dev/null +++ b/echo-server/overlays/tenant-tpl/kustomization.yaml @@ -0,0 +1,5 @@ +resources: + - ../../base + +patchesStrategicMerge: + - patch-resources.yaml diff --git a/echo-server/overlays/tenant-tpl/patch-resources.yaml b/echo-server/overlays/tenant-tpl/patch-resources.yaml new file mode 100644 index 0000000..0a35fe1 --- /dev/null +++ b/echo-server/overlays/tenant-tpl/patch-resources.yaml @@ -0,0 +1,17 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: echo-server +spec: + values: + controllers: + echo-server: + containers: + app: + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 500m + memory: 512Mi From 699c2bb099e1d2192fc4f14c19c3b2a27f11bcf5 Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Mon, 15 Sep 2025 13:08:44 +0200 Subject: [PATCH 3/4] Correct overlays structu --- echo-server/base/kustomization.yaml | 2 ++ echo-server/ks.yaml | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) create mode 100644 echo-server/base/kustomization.yaml diff --git a/echo-server/base/kustomization.yaml b/echo-server/base/kustomization.yaml new file mode 100644 index 0000000..228331d --- /dev/null +++ b/echo-server/base/kustomization.yaml @@ -0,0 +1,2 @@ +ressources: + - helmrelease.yaml diff --git a/echo-server/ks.yaml b/echo-server/ks.yaml index f293297..d47f94b 100644 --- a/echo-server/ks.yaml +++ b/echo-server/ks.yaml @@ -5,26 +5,6 @@ kind: Kustomization metadata: name: &app echo-server namespace: ${TENANT_NAMESPACE} -spec: - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./echo-server/base - prune: true - sourceRef: - kind: GitRepository - name: tenant-repos - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app echo-server-overlays - namespace: ${TENANT_NAMESPACE} spec: commonMetadata: labels: From 3f1afa0f19882e2c6acdf318b6a6d0195e24d046 Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Mon, 15 Sep 2025 13:11:49 +0200 Subject: [PATCH 4/4] Correct Ks --- echo-server/base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echo-server/base/kustomization.yaml b/echo-server/base/kustomization.yaml index 228331d..016463c 100644 --- a/echo-server/base/kustomization.yaml +++ b/echo-server/base/kustomization.yaml @@ -1,2 +1,2 @@ -ressources: +resources: - helmrelease.yaml