From 572966f8c19635dc82fe5c07474809920b05b387 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 5 Jul 2025 23:18:17 +1000 Subject: [PATCH 1/2] Better structure --- deployments/manifests/10-prod.yaml | 28 ------------------ .../{10-dev.yaml => 10-repository.yaml} | 29 +++++++++---------- deployments/manifests/20-dev.yaml | 14 +++++++++ deployments/manifests/20-prod.yaml | 14 +++++++++ 4 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 deployments/manifests/10-prod.yaml rename deployments/manifests/{10-dev.yaml => 10-repository.yaml} (58%) create mode 100644 deployments/manifests/20-dev.yaml create mode 100644 deployments/manifests/20-prod.yaml diff --git a/deployments/manifests/10-prod.yaml b/deployments/manifests/10-prod.yaml deleted file mode 100644 index 83c9673..0000000 --- a/deployments/manifests/10-prod.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: GitRepository -metadata: - name: home-server - namespace: flux-system -spec: - interval: 1m - url: ssh://git@repobase.net/j/home-server.git - secretRef: - name: flux-ssh - ref: - branch: main - ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: home-server - namespace: flux-system -spec: - interval: 1m - path: ./deployments - prune: true - sourceRef: - kind: GitRepository - name: home-server - targetNamespace: home-server diff --git a/deployments/manifests/10-dev.yaml b/deployments/manifests/10-repository.yaml similarity index 58% rename from deployments/manifests/10-dev.yaml rename to deployments/manifests/10-repository.yaml index ac07858..caab7b9 100644 --- a/deployments/manifests/10-dev.yaml +++ b/deployments/manifests/10-repository.yaml @@ -1,3 +1,17 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: GitRepository +metadata: + name: home-server-prod + namespace: flux-system +spec: + interval: 1m + url: ssh://git@repobase.net/j/home-server.git + secretRef: + name: flux-ssh + ref: + branch: main + --- apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository @@ -11,18 +25,3 @@ spec: name: flux-ssh ref: branch: dev - ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: home-server-dev - namespace: flux-system -spec: - interval: 1m - path: ./deployments - prune: true - sourceRef: - kind: GitRepository - name: home-server-dev - targetNamespace: home-server-dev diff --git a/deployments/manifests/20-dev.yaml b/deployments/manifests/20-dev.yaml new file mode 100644 index 0000000..0e1ebe5 --- /dev/null +++ b/deployments/manifests/20-dev.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: home-server-dev + namespace: flux-system +spec: + interval: 1m + path: ./deployments + prune: true + sourceRef: + kind: GitRepository + name: home-server-dev + targetNamespace: home-server-dev diff --git a/deployments/manifests/20-prod.yaml b/deployments/manifests/20-prod.yaml new file mode 100644 index 0000000..1f5d4bd --- /dev/null +++ b/deployments/manifests/20-prod.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: home-server-prod + namespace: flux-system +spec: + interval: 1m + path: ./deployments + prune: true + sourceRef: + kind: GitRepository + name: home-server-prod + targetNamespace: home-server From d12d77aa03a6553bfc400a3550ebdc60b83d7928 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 5 Jul 2025 23:25:25 +1000 Subject: [PATCH 2/2] Deploy correct manifests --- deployments/kustomization.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 72ce1b0..1451599 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -3,5 +3,6 @@ kind: Kustomization resources: - manifests/00-namespaces.yaml - - manifests/10-dev.yaml - - manifests/10-prod.yaml + - manifests/10-repository.yaml + - manifests/20-dev.yaml + - manifests/20-prod.yaml