diff --git a/clusters/titan.lan.huizinga.dev/apps.yaml b/clusters/titan.lan.huizinga.dev/apps.yaml index c5121c2..0d5fb12 100644 --- a/clusters/titan.lan.huizinga.dev/apps.yaml +++ b/clusters/titan.lan.huizinga.dev/apps.yaml @@ -5,9 +5,9 @@ metadata: namespace: flux-system spec: dependsOn: - - name: infra-configs - name: traefik - - name: topolvm + - name: cnpg + - name: dragonflydb - name: rook-ceph-cluster - name: akri decryption: diff --git a/clusters/titan.lan.huizinga.dev/apps/test-app.yaml b/clusters/titan.lan.huizinga.dev/apps/test-app.yaml index b37a480..b4cd120 100644 --- a/clusters/titan.lan.huizinga.dev/apps/test-app.yaml +++ b/clusters/titan.lan.huizinga.dev/apps/test-app.yaml @@ -16,6 +16,8 @@ metadata: namespace: flux-system spec: interval: 15m + dependsOn: + - name: traefik prune: true timeout: 2m sourceRef: diff --git a/clusters/titan.lan.huizinga.dev/infra/authelia.yaml b/clusters/titan.lan.huizinga.dev/infra/authelia.yaml index 0c76d9a..4df9441 100644 --- a/clusters/titan.lan.huizinga.dev/infra/authelia.yaml +++ b/clusters/titan.lan.huizinga.dev/infra/authelia.yaml @@ -7,9 +7,9 @@ spec: interval: 15m path: ./infra/authelia dependsOn: + - name: traefik - name: cnpg - - name: infra-controllers - - name: apps + - name: dragonflydb prune: true timeout: 2m sourceRef: diff --git a/clusters/titan.lan.huizinga.dev/infrastructure.yaml b/clusters/titan.lan.huizinga.dev/infrastructure.yaml deleted file mode 100644 index d014b09..0000000 --- a/clusters/titan.lan.huizinga.dev/infrastructure.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: infra-controllers - namespace: flux-system -spec: - dependsOn: - - name: cert-manager - decryption: - provider: sops - secretRef: - name: sops-gpg - interval: 1h - retryInterval: 1m - timeout: 5m - sourceRef: - kind: GitRepository - name: flux-system - postBuild: - substituteFrom: - - kind: ConfigMap - name: domain-vars - path: ./infrastructure/controllers - prune: true - wait: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: infra-configs - namespace: flux-system -spec: - dependsOn: - - name: infra-controllers - - name: cert-manager - decryption: - provider: sops - secretRef: - name: sops-gpg - interval: 1h - retryInterval: 1m - timeout: 5m - sourceRef: - kind: GitRepository - name: flux-system - path: ./infrastructure/configs - prune: true - wait: true - # Uncomment this in case of disaster recovery - # suspend: true diff --git a/infrastructure/configs/kustomization.yaml b/infrastructure/configs/kustomization.yaml deleted file mode 100644 index b83b23e..0000000 --- a/infrastructure/configs/kustomization.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: [] diff --git a/infrastructure/controllers/kustomization.yaml b/infrastructure/controllers/kustomization.yaml deleted file mode 100644 index b83b23e..0000000 --- a/infrastructure/controllers/kustomization.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: [] diff --git a/scripts/reconcile.sh b/scripts/reconcile.sh deleted file mode 100755 index 83ac2c1..0000000 --- a/scripts/reconcile.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -flux reconcile source git flux-system -flux reconcile kustomization flux-system -flux reconcile kustomization infra-controllers -flux reconcile kustomization infra-configs -flux reconcile kustomization apps