From 33f13986d701977881ef4e60f7298acd8b5495ac Mon Sep 17 00:00:00 2001 From: Scotte Zinn Date: Sat, 25 Jan 2025 16:38:37 -0500 Subject: [PATCH] feat(main): Rename flux/cluster to cluster/config This is a multi-step process collapsed into a single commit * set prune=false for flux/cluster, then deploy * add empty kustomization to cluster/config and point flux-system/flux-operator/instance at it, then deploy * move cluster.yaml to cluster/config, then deploy * set prune=true --- .../flux-system/flux-operator/instance/helm-values.yaml | 2 +- .../main/{flux/cluster => cluster/config}/cluster.yaml | 0 kubernetes/main/cluster/settings/kustomization.yaml | 6 ++++++ 3 files changed, 7 insertions(+), 1 deletion(-) rename kubernetes/main/{flux/cluster => cluster/config}/cluster.yaml (100%) create mode 100644 kubernetes/main/cluster/settings/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml b/kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml index b7db4c1421..7fcde380b1 100644 --- a/kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml +++ b/kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml @@ -14,7 +14,7 @@ instance: kind: GitRepository url: https://github.com/szinn/k8s-homelab.git ref: refs/heads/main - path: kubernetes/main/flux/cluster + path: kubernetes/main/cluster/config commonMetadata: labels: app.kubernetes.io/name: flux diff --git a/kubernetes/main/flux/cluster/cluster.yaml b/kubernetes/main/cluster/config/cluster.yaml similarity index 100% rename from kubernetes/main/flux/cluster/cluster.yaml rename to kubernetes/main/cluster/config/cluster.yaml diff --git a/kubernetes/main/cluster/settings/kustomization.yaml b/kubernetes/main/cluster/settings/kustomization.yaml new file mode 100644 index 0000000000..9a9b327efc --- /dev/null +++ b/kubernetes/main/cluster/settings/kustomization.yaml @@ -0,0 +1,6 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: flux-system +resources: []