From 47c0db1e28b06dcd5b8410bf64577867203de4ff Mon Sep 17 00:00:00 2001 From: Mic Szillat Date: Fri, 3 May 2024 16:23:59 +0200 Subject: [PATCH] fix: Error on kustomize patch Fix error when applying a patch with kustomize. The k3s1 cluster directory didn't follow recommendation. Now it should be correct. --- clusters/k3s1/apps.yaml | 2 +- clusters/k3s1/kustomization.yaml | 11 ----------- environments/prod/kustomization.yaml | 3 +++ .../prod/patch-dendrite.yaml | 0 .../prod/patch-grafana.yaml | 0 5 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 clusters/k3s1/kustomization.yaml rename clusters/k3s1/dendrite-helm-release.yaml => environments/prod/patch-dendrite.yaml (100%) rename clusters/k3s1/grafana-helm-release.yaml => environments/prod/patch-grafana.yaml (100%) diff --git a/clusters/k3s1/apps.yaml b/clusters/k3s1/apps.yaml index 5aaff15..3f083c4 100644 --- a/clusters/k3s1/apps.yaml +++ b/clusters/k3s1/apps.yaml @@ -11,5 +11,5 @@ spec: sourceRef: kind: GitRepository name: flux-system - path: ./base/metallb + path: ./environments/prod prune: false diff --git a/clusters/k3s1/kustomization.yaml b/clusters/k3s1/kustomization.yaml deleted file mode 100644 index 2dfe781..0000000 --- a/clusters/k3s1/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- flux-system -- ../../environments/prod -- traefik-config.yaml -- apps.yaml -patchesStrategicMerge: -- dendrite-helm-release.yaml -- grafana-helm-release.yaml diff --git a/environments/prod/kustomization.yaml b/environments/prod/kustomization.yaml index 148f4d8..54094d8 100644 --- a/environments/prod/kustomization.yaml +++ b/environments/prod/kustomization.yaml @@ -9,3 +9,6 @@ resources: - ../../base/grafana - ../../base/prometheus - ../../base/snowflake +patches: +- path: patch-dendrite.yaml +- path: patch-grafana.yaml diff --git a/clusters/k3s1/dendrite-helm-release.yaml b/environments/prod/patch-dendrite.yaml similarity index 100% rename from clusters/k3s1/dendrite-helm-release.yaml rename to environments/prod/patch-dendrite.yaml diff --git a/clusters/k3s1/grafana-helm-release.yaml b/environments/prod/patch-grafana.yaml similarity index 100% rename from clusters/k3s1/grafana-helm-release.yaml rename to environments/prod/patch-grafana.yaml