diff --git a/longhorn/longhorn-helm-repo.yaml b/base/longhorn/longhorn-helm-repo.yaml similarity index 100% rename from longhorn/longhorn-helm-repo.yaml rename to base/longhorn/longhorn-helm-repo.yaml diff --git a/longhorn/longhorn-namespace.yaml b/base/longhorn/longhorn-namespace.yaml similarity index 100% rename from longhorn/longhorn-namespace.yaml rename to base/longhorn/longhorn-namespace.yaml diff --git a/longhorn/longhorn.yaml b/base/longhorn/longhorn.yaml similarity index 100% rename from longhorn/longhorn.yaml rename to base/longhorn/longhorn.yaml diff --git a/metallb/metallb-helm-repo.yaml b/base/metallb/metallb-helm-repo.yaml similarity index 100% rename from metallb/metallb-helm-repo.yaml rename to base/metallb/metallb-helm-repo.yaml diff --git a/metallb/metallb-kustomization-config.yaml b/base/metallb/metallb-kustomization-config.yaml similarity index 95% rename from metallb/metallb-kustomization-config.yaml rename to base/metallb/metallb-kustomization-config.yaml index 4cb1a74..4ffe588 100644 --- a/metallb/metallb-kustomization-config.yaml +++ b/base/metallb/metallb-kustomization-config.yaml @@ -7,7 +7,7 @@ spec: interval: 15m dependsOn: - name: metallb--metallb-system - path: ./metallb-system + path: metallb prune: true # remove any elements later removed from the above path timeout: 2m # if not set, this defaults to interval duration, which is 1h sourceRef: diff --git a/metallb/metallb-kustomization.yaml b/base/metallb/metallb-kustomization.yaml similarity index 95% rename from metallb/metallb-kustomization.yaml rename to base/metallb/metallb-kustomization.yaml index 723c3be..ba13e45 100644 --- a/metallb/metallb-kustomization.yaml +++ b/base/metallb/metallb-kustomization.yaml @@ -5,7 +5,7 @@ metadata: namespace: flux-system spec: interval: 15m - path: ./metallb-system + path: metallb prune: true # remove any elements later removed from the above path timeout: 2m # if not set, this defaults to interval duration, which is 1h sourceRef: diff --git a/metallb/metallb-namespace.yaml b/base/metallb/metallb-namespace.yaml similarity index 100% rename from metallb/metallb-namespace.yaml rename to base/metallb/metallb-namespace.yaml diff --git a/sealed-secrets/sealed-secrets-helm-repo.yaml b/base/sealed-secrets/sealed-secrets-helm-repo.yaml similarity index 100% rename from sealed-secrets/sealed-secrets-helm-repo.yaml rename to base/sealed-secrets/sealed-secrets-helm-repo.yaml diff --git a/sealed-secrets/sealed-secrets-kustomization.yaml b/base/sealed-secrets/sealed-secrets-kustomization.yaml similarity index 81% rename from sealed-secrets/sealed-secrets-kustomization.yaml rename to base/sealed-secrets/sealed-secrets-kustomization.yaml index 893bf2d..47ef9f2 100644 --- a/sealed-secrets/sealed-secrets-kustomization.yaml +++ b/base/sealed-secrets/sealed-secrets-kustomization.yaml @@ -5,9 +5,9 @@ metadata: namespace: flux-system spec: interval: 15m - path: sealed-secrets-system + path: sealed-secrets prune: true # remove any elements later removed from the above path - timeout: 2m # if not set, this defaults to interval duration, which is 1h + timeout: 5m # if not set, this defaults to interval duration, which is 1h sourceRef: kind: GitRepository name: flux-system diff --git a/sealed-secrets/sealed-secrets-namespace.yaml b/base/sealed-secrets/sealed-secrets-namespace.yaml similarity index 100% rename from sealed-secrets/sealed-secrets-namespace.yaml rename to base/sealed-secrets/sealed-secrets-namespace.yaml diff --git a/metallb-system/config-map-overrides.yaml b/metallb/config-map-overrides.yaml similarity index 100% rename from metallb-system/config-map-overrides.yaml rename to metallb/config-map-overrides.yaml diff --git a/metallb-system/helmrelease-metallb.yaml b/metallb/helmrelease-metallb.yaml similarity index 100% rename from metallb-system/helmrelease-metallb.yaml rename to metallb/helmrelease-metallb.yaml diff --git a/metallb-system/ipaddresspool.yaml b/metallb/ipaddresspool.yaml similarity index 100% rename from metallb-system/ipaddresspool.yaml rename to metallb/ipaddresspool.yaml diff --git a/metallb-system/l2-advertisement.yaml b/metallb/l2-advertisement.yaml similarity index 100% rename from metallb-system/l2-advertisement.yaml rename to metallb/l2-advertisement.yaml diff --git a/sealed-secrets-system/config-map-overrides.yaml b/sealed-secrets/config-map-overrides.yaml similarity index 100% rename from sealed-secrets-system/config-map-overrides.yaml rename to sealed-secrets/config-map-overrides.yaml diff --git a/sealed-secrets-system/helmrelease-sealed-secrets.yaml b/sealed-secrets/helmrelease-sealed-secrets.yaml similarity index 100% rename from sealed-secrets-system/helmrelease-sealed-secrets.yaml rename to sealed-secrets/helmrelease-sealed-secrets.yaml