diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 1451599..72ce1b0 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -3,6 +3,5 @@ kind: Kustomization resources: - manifests/00-namespaces.yaml - - manifests/10-repository.yaml - - manifests/20-dev.yaml - - manifests/20-prod.yaml + - manifests/10-dev.yaml + - manifests/10-prod.yaml diff --git a/deployments/manifests/10-repository.yaml b/deployments/manifests/10-dev.yaml similarity index 58% rename from deployments/manifests/10-repository.yaml rename to deployments/manifests/10-dev.yaml index caab7b9..ac07858 100644 --- a/deployments/manifests/10-repository.yaml +++ b/deployments/manifests/10-dev.yaml @@ -1,17 +1,3 @@ ---- -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 @@ -25,3 +11,18 @@ 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/10-prod.yaml b/deployments/manifests/10-prod.yaml new file mode 100644 index 0000000..83c9673 --- /dev/null +++ b/deployments/manifests/10-prod.yaml @@ -0,0 +1,28 @@ +--- +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/20-dev.yaml b/deployments/manifests/20-dev.yaml deleted file mode 100644 index 0e1ebe5..0000000 --- a/deployments/manifests/20-dev.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -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 deleted file mode 100644 index 1f5d4bd..0000000 --- a/deployments/manifests/20-prod.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -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