From b1bd17b9a6a278895b59c222210130d4b58634e8 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Tue, 7 Jan 2025 19:28:30 +0100 Subject: [PATCH] flux-system: cleanup Signed-off-by: paulfantom --- base/flux-apps/flux-system.yaml | 3 +-- base/flux-system/Makefile | 9 --------- base/flux-system/{manifests => }/certManagerPolicy.yaml | 0 base/flux-system/{manifests => }/githubToken.yaml | 0 base/flux-system/{manifests => }/kustomization.yaml | 0 base/flux-system/{manifests => }/kustomizeconfig.yaml | 0 base/flux-system/{manifests => }/namespace.yaml | 0 base/flux-system/{manifests => }/prometheusRules.yaml | 0 base/flux-system/{manifests => }/receiver.yaml | 0 base/flux-system/{manifests => }/release.yaml | 0 base/flux-system/{manifests => }/repository.yaml | 0 base/flux-system/{manifests => }/values.yaml | 0 12 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 base/flux-system/Makefile rename base/flux-system/{manifests => }/certManagerPolicy.yaml (100%) rename base/flux-system/{manifests => }/githubToken.yaml (100%) rename base/flux-system/{manifests => }/kustomization.yaml (100%) rename base/flux-system/{manifests => }/kustomizeconfig.yaml (100%) rename base/flux-system/{manifests => }/namespace.yaml (100%) rename base/flux-system/{manifests => }/prometheusRules.yaml (100%) rename base/flux-system/{manifests => }/receiver.yaml (100%) rename base/flux-system/{manifests => }/release.yaml (100%) rename base/flux-system/{manifests => }/repository.yaml (100%) rename base/flux-system/{manifests => }/values.yaml (100%) diff --git a/base/flux-apps/flux-system.yaml b/base/flux-apps/flux-system.yaml index 486f15b11..9540a7f36 100644 --- a/base/flux-apps/flux-system.yaml +++ b/base/flux-apps/flux-system.yaml @@ -5,9 +5,8 @@ metadata: namespace: flux-apps spec: interval: 2m0s - path: ./base/flux-system/manifests + path: ./base/flux-system prune: false # TODO: check if this can be set to 'true' without compromising the cluster sourceRef: kind: GitRepository name: ankhmorpork - diff --git a/base/flux-system/Makefile b/base/flux-system/Makefile deleted file mode 100644 index cbcc05cb6..000000000 --- a/base/flux-system/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -include ../../Makefile.common - -MANIFESTS_DIR=manifests/configs - -.PHONY: version-update -version-update: - # wget -O manifests/podmonitor.yaml https://raw.githubusercontent.com/fluxcd/flux2/main/manifests/monitoring/monitoring-config/podmonitor.yaml - wget -O manifests/install.yaml https://github.com/fluxcd/flux2/releases/latest/download/install.yaml - @echo "fluxcd potentially upgraded" >> "$(shell git rev-parse --show-toplevel)/.version-changelog" diff --git a/base/flux-system/manifests/certManagerPolicy.yaml b/base/flux-system/certManagerPolicy.yaml similarity index 100% rename from base/flux-system/manifests/certManagerPolicy.yaml rename to base/flux-system/certManagerPolicy.yaml diff --git a/base/flux-system/manifests/githubToken.yaml b/base/flux-system/githubToken.yaml similarity index 100% rename from base/flux-system/manifests/githubToken.yaml rename to base/flux-system/githubToken.yaml diff --git a/base/flux-system/manifests/kustomization.yaml b/base/flux-system/kustomization.yaml similarity index 100% rename from base/flux-system/manifests/kustomization.yaml rename to base/flux-system/kustomization.yaml diff --git a/base/flux-system/manifests/kustomizeconfig.yaml b/base/flux-system/kustomizeconfig.yaml similarity index 100% rename from base/flux-system/manifests/kustomizeconfig.yaml rename to base/flux-system/kustomizeconfig.yaml diff --git a/base/flux-system/manifests/namespace.yaml b/base/flux-system/namespace.yaml similarity index 100% rename from base/flux-system/manifests/namespace.yaml rename to base/flux-system/namespace.yaml diff --git a/base/flux-system/manifests/prometheusRules.yaml b/base/flux-system/prometheusRules.yaml similarity index 100% rename from base/flux-system/manifests/prometheusRules.yaml rename to base/flux-system/prometheusRules.yaml diff --git a/base/flux-system/manifests/receiver.yaml b/base/flux-system/receiver.yaml similarity index 100% rename from base/flux-system/manifests/receiver.yaml rename to base/flux-system/receiver.yaml diff --git a/base/flux-system/manifests/release.yaml b/base/flux-system/release.yaml similarity index 100% rename from base/flux-system/manifests/release.yaml rename to base/flux-system/release.yaml diff --git a/base/flux-system/manifests/repository.yaml b/base/flux-system/repository.yaml similarity index 100% rename from base/flux-system/manifests/repository.yaml rename to base/flux-system/repository.yaml diff --git a/base/flux-system/manifests/values.yaml b/base/flux-system/values.yaml similarity index 100% rename from base/flux-system/manifests/values.yaml rename to base/flux-system/values.yaml