diff --git a/deployments/auth/kustomization.yaml b/deployments/auth/kustomization.yaml deleted file mode 100644 index fb10ef1..0000000 --- a/deployments/auth/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - authentik.yaml diff --git a/deployments/auth/authentik.yaml b/deployments/home-server/authentik.yaml similarity index 100% rename from deployments/auth/authentik.yaml rename to deployments/home-server/authentik.yaml diff --git a/deployments/dns/bind.yaml b/deployments/home-server/bind.yaml similarity index 100% rename from deployments/dns/bind.yaml rename to deployments/home-server/bind.yaml diff --git a/deployments/ssl/certmanager.yaml b/deployments/home-server/certmanager.yaml similarity index 100% rename from deployments/ssl/certmanager.yaml rename to deployments/home-server/certmanager.yaml diff --git a/deployments/dns/externaldns.yaml b/deployments/home-server/externaldns.yaml similarity index 100% rename from deployments/dns/externaldns.yaml rename to deployments/home-server/externaldns.yaml diff --git a/deployments/dns/kustomization.yaml b/deployments/home-server/kustomization.yaml similarity index 66% rename from deployments/dns/kustomization.yaml rename to deployments/home-server/kustomization.yaml index 05ba44c..323f746 100644 --- a/deployments/dns/kustomization.yaml +++ b/deployments/home-server/kustomization.yaml @@ -3,5 +3,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - authentik.yaml - bind.yaml + - certmanager.yaml - externaldns.yaml + - nextcloud.yaml diff --git a/deployments/nextcloud/nextcloud.yaml b/deployments/home-server/nextcloud.yaml similarity index 100% rename from deployments/nextcloud/nextcloud.yaml rename to deployments/home-server/nextcloud.yaml diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 879c9a8..4e604db 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -1,100 +1,6 @@ ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -metadata: - name: namespace - namespace: flux-system -spec: - interval: 1m - path: ./deployments/namespace - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: dns - namespace: flux-system -spec: - interval: 1m - path: ./deployments/dns - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: replicator - namespace: flux-system -spec: - interval: 1m - path: ./deployments/replicator - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: ssl - namespace: flux-system -spec: - interval: 1m - path: ./deployments/ssl - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: mariadb - namespace: flux-system -spec: - interval: 1m - path: ./deployments/mariadb - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: auth - namespace: flux-system -spec: - interval: 1m - path: ./deployments/auth - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: nextcloud - namespace: flux-system -spec: - interval: 1m - path: ./deployments/nextcloud # <— Make sure this points to your nextcloud manifests folder, NOT mariadb - prune: true - sourceRef: - kind: GitRepository - name: home-server-deployment - dependsOn: - - name: mariadb +resources: +- kusts/operators.yaml +- kusts/home-server.yaml diff --git a/deployments/kusts/home-server.yaml b/deployments/kusts/home-server.yaml new file mode 100644 index 0000000..e39af5f --- /dev/null +++ b/deployments/kusts/home-server.yaml @@ -0,0 +1,30 @@ +## I am so fucking mad with Flux right now I can't even begin explaining it. +# I have to do this because it doesn't respect order in kusts... +--- +apiVersion: source.toolkit.fluxcd.io/v1 +kind: GitRepository +metadata: + name: home-server-apps + namespace: flux-system +spec: + interval: 1m0s + ref: + branch: main + url: ssh://git@repobase.net/j/home-server.git + secretRef: + name: ssh-credentials +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: home-server-apps + namespace: flux-system +spec: + interval: 1m0s + path: ./deployments/home-server + prune: true + sourceRef: + kind: GitRepository + name: home-server-apps + targetNamespace: home-server + diff --git a/deployments/kusts/operators.yaml b/deployments/kusts/operators.yaml new file mode 100644 index 0000000..cade079 --- /dev/null +++ b/deployments/kusts/operators.yaml @@ -0,0 +1,30 @@ +## I am so fucking mad with Flux right now I can't even begin explaining it. +# I have to do this because it doesn't respect order in kusts... +--- +apiVersion: source.toolkit.fluxcd.io/v1 +kind: GitRepository +metadata: + name: operators + namespace: flux-system +spec: + interval: 1m0s + ref: + branch: main + url: ssh://git@repobase.net/j/home-server.git + secretRef: + name: ssh-credentials +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: operators + namespace: flux-system +spec: + interval: 1m0s + path: ./deployments/operators + prune: true + sourceRef: + kind: GitRepository + name: operators + targetNamespace: home-server + diff --git a/deployments/mariadb/kustomization.yaml b/deployments/mariadb/kustomization.yaml deleted file mode 100644 index da9cfdb..0000000 --- a/deployments/mariadb/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - mariadb.yaml diff --git a/deployments/nextcloud/kustomization.yaml b/deployments/nextcloud/kustomization.yaml deleted file mode 100644 index 777fa28..0000000 --- a/deployments/nextcloud/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - nextcloud.yaml diff --git a/deployments/replicator/kustomization.yaml b/deployments/operators/kustomization.yaml similarity index 73% rename from deployments/replicator/kustomization.yaml rename to deployments/operators/kustomization.yaml index c1aa572..0bd70c1 100644 --- a/deployments/replicator/kustomization.yaml +++ b/deployments/operators/kustomization.yaml @@ -3,4 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: + - mariadb.yaml - replicator.yaml + - namespace.yaml diff --git a/deployments/mariadb/mariadb.yaml b/deployments/operators/mariadb.yaml similarity index 99% rename from deployments/mariadb/mariadb.yaml rename to deployments/operators/mariadb.yaml index 26f7f39..576d0ce 100644 --- a/deployments/mariadb/mariadb.yaml +++ b/deployments/operators/mariadb.yaml @@ -54,3 +54,4 @@ spec: dependsOn: - name: mariadb-operator-crds namespace: mariadb-system + diff --git a/deployments/namespace/namespace.yaml b/deployments/operators/namespace.yaml similarity index 100% rename from deployments/namespace/namespace.yaml rename to deployments/operators/namespace.yaml diff --git a/deployments/replicator/replicator.yaml b/deployments/operators/replicator.yaml similarity index 100% rename from deployments/replicator/replicator.yaml rename to deployments/operators/replicator.yaml diff --git a/deployments/ssl/kustomization.yaml b/deployments/ssl/kustomization.yaml deleted file mode 100644 index 2c0445b..0000000 --- a/deployments/ssl/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - certmanager.yaml