diff --git a/.github/labeler.yaml b/.github/labeler.yaml index af6ba72e0bbe0..f64e0f13612a0 100644 --- a/.github/labeler.yaml +++ b/.github/labeler.yaml @@ -16,7 +16,3 @@ area/taskfile: - any-glob-to-any-file: - ".taskfiles/**/*" - "Taskfile.yaml" -# Clusters -cluster/main: - - changed-files: - - any-glob-to-any-file: "kubernetes/main/**/*" diff --git a/.github/labels.yaml b/.github/labels.yaml index 86f42d1d96fea..7841c85779ac0 100644 --- a/.github/labels.yaml +++ b/.github/labels.yaml @@ -8,9 +8,6 @@ color: "0e8a16" - name: area/taskfile color: "0e8a16" -# Clusters -- name: cluster/main - color: "ffc300" # Renovate Types - name: renovate/container color: "027fa0" diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 7bed30a516637..32c0e231444a4 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -11,7 +11,6 @@ ":skipStatusChecks", ":timezone(America/New_York)", "github>onedr0p/home-ops//.github/renovate/autoMerge.json5", - "github>onedr0p/home-ops//.github/renovate/clusters.json5", "github>onedr0p/home-ops//.github/renovate/customManagers.json5", "github>onedr0p/home-ops//.github/renovate/grafanaDashboards.json5", "github>onedr0p/home-ops//.github/renovate/groups.json5", diff --git a/.github/renovate/clusters.json5 b/.github/renovate/clusters.json5 deleted file mode 100644 index d6d3187daa43e..0000000000000 --- a/.github/renovate/clusters.json5 +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "packageRules": [ - { - "description": ["PRs for main cluster"], - "matchFileNames": ["**/kubernetes/main/**"], - "additionalBranchPrefix": "main-" - } - ] -} diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml index bd4713ea9baa6..59ee2b5a34497 100644 --- a/.github/workflows/flux-diff.yaml +++ b/.github/workflows/flux-diff.yaml @@ -6,9 +6,7 @@ on: pull_request: branches: ["main"] paths: - - kubernetes/main/apps/** - - kubernetes/main/flux/** - - kubernetes/shared/** + - kubernetes/** concurrency: group: ${{ github.workflow }}-${{ github.event.number || github.ref }} @@ -52,8 +50,8 @@ jobs: args: >- diff ${{ matrix.resources }} --unified 6 - --path /github/workspace/pull/kubernetes/main/flux/config - --path-orig /github/workspace/default/kubernetes/main/flux/config + --path /github/workspace/pull/kubernetes/flux/cluster + --path-orig /github/workspace/default/kubernetes/flux/cluster --strip-attrs "helm.sh/chart,checksum/config,app.kubernetes.io/version,chart" --limit-bytes 10000 --all-namespaces @@ -81,7 +79,7 @@ jobs: uses: mshick/add-pr-comment@v2 with: repo-token: "${{ steps.app-token.outputs.token }}" - message-id: "${{ github.event.pull_request.number }}/kubernetes/main/${{ matrix.resources }}" + message-id: "${{ github.event.pull_request.number }}/kubernetes/${{ matrix.resources }}" message-failure: Diff was not successful message: | ```diff diff --git a/.github/workflows/pre-pull-images.yaml b/.github/workflows/pre-pull-images.yaml index acbec1561ad9c..97083b6f5a5df 100644 --- a/.github/workflows/pre-pull-images.yaml +++ b/.github/workflows/pre-pull-images.yaml @@ -6,9 +6,7 @@ on: pull_request: branches: ["main"] paths: - - kubernetes/main/apps/** - - kubernetes/main/flux/** - - kubernetes/shared/** + - kubernetes/** concurrency: group: ${{ github.workflow }}-${{ github.event.number || github.ref }} @@ -47,7 +45,7 @@ jobs: with: args: >- get cluster - --path /github/workspace/kubernetes/main/flux + --path /github/workspace/kubernetes/flux/cluster --enable-images --output yaml --output-file images.yaml diff --git a/.mise.toml b/.mise.toml index 223a044a20eee..a93c542a8041e 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,7 +1,7 @@ [env] -KUBECONFIG = '{{config_root}}/kubernetes/main/kubeconfig' +KUBECONFIG = '{{config_root}}/kubernetes/kubeconfig' MINIJINJA_CONFIG_FILE = '{{config_root}}/.minijinja.toml' SOPS_AGE_KEY_FILE = '{{config_root}}/age.key' -TALOSCONFIG = '{{config_root}}/kubernetes/main/talosconfig' +TALOSCONFIG = '{{config_root}}/kubernetes/talosconfig' TASK_X_ENV_PRECEDENCE = 1 TASK_X_MAP_VARIABLES = 0 diff --git a/.taskfiles/bootstrap/Taskfile.yaml b/.taskfiles/bootstrap/Taskfile.yaml index b910843df2f35..b1aceee233697 100644 --- a/.taskfiles/bootstrap/Taskfile.yaml +++ b/.taskfiles/bootstrap/Taskfile.yaml @@ -5,49 +5,47 @@ version: '3' tasks: talos: - desc: Bootstrap Talos [CLUSTER=main] - dotenv: ['{{.CLUSTER_DIR}}/cluster.env'] + desc: Bootstrap Talos + dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env'] cmds: - for: { var: TALOS_NODES } cmd: > sops exec-file --input-type yaml --output-type yaml {{.ITEM}} "minijinja-cli {}" | talosctl --nodes {{base .ITEM | replace ".sops.yaml.j2" ""}} apply-config --insecure --file /dev/stdin - until talosctl --nodes {{.TALOS_CONTROLLER}} bootstrap; do sleep 5; done - - talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name {{.CLUSTER}} {{.CLUSTER_DIR}} + - talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name main {{.CLUSTER_DIR}} vars: TALOS_CONTROLLER: sh: talosctl config info --output json | jq --raw-output '.endpoints[]' | shuf -n 1 TALOS_NODES: - sh: ls {{.CLUSTER_DIR}}/talos/*.j2 - requires: - vars: [CLUSTER] + sh: ls {{.BOOTSTRAP_DIR}}/talos/*.j2 preconditions: - talosctl config info - test -f {{.CLUSTER_DIR}}/talosconfig - which jq minijinja-cli sops talosctl apps: - desc: Bootstrap Apps [CLUSTER=main] [MODEL=required] + desc: Bootstrap Apps [MODEL=required] prompt: Bootstrap apps into the Talos cluster? cmds: - until kubectl wait nodes --for=condition=Ready=False --all --timeout=10m; do sleep 5; done - - op run --env-file {{.CLUSTER_DIR}}/bootstrap/bootstrap.env --no-masking -- minijinja-cli {{.CLUSTER_DIR}}/bootstrap/templates/resources.yaml.j2 | kubectl apply --server-side --filename - - - helmfile --quiet --file {{.CLUSTER_DIR}}/bootstrap/helmfile.yaml apply --skip-diff-on-install --suppress-diff - - helmfile --quiet --file {{.CLUSTER_DIR}}/bootstrap/helmfile.yaml destroy --selector release=wipe-rook + - op run --env-file {{.BOOTSTRAP_DIR}}/.secrets.env --no-masking -- minijinja-cli {{.BOOTSTRAP_DIR}}/apps/templates/resources.yaml.j2 | kubectl apply --server-side --filename - + - helmfile --quiet --file {{.BOOTSTRAP_DIR}}/apps/helmfile.yaml apply --skip-diff-on-install --suppress-diff + - helmfile --quiet --file {{.BOOTSTRAP_DIR}}/apps/helmfile.yaml destroy --selector name=wipe-rook env: FLUX_GITHUB_PUBLIC_KEYS: sh: curl -fsSL https://api.github.com/meta | jq --raw-output '"github.com "+.ssh_keys[]' MODEL: '{{.MODEL}}' NODE_COUNT: sh: talosctl config info --output json | jq --raw-output '.nodes | length' - VAULT: '{{if eq .CLUSTER "main"}}kubernetes{{else}}{{.CLUSTER}}{{end}}' # ¯\_(ツ)_/¯ + VAULT: kubernetes requires: - vars: [CLUSTER, MODEL] + vars: [MODEL] preconditions: - op user get --me - talosctl config info - test -f {{.CLUSTER_DIR}}/talosconfig - - test -f {{.CLUSTER_DIR}}/bootstrap/helmfile.yaml - - test -f {{.CLUSTER_DIR}}/bootstrap/templates/resources.yaml.j2 - - test -f {{.CLUSTER_DIR}}/bootstrap/templates/wipe-rook.yaml.gotmpl + - test -f {{.BOOTSTRAP_DIR}}/apps/helmfile.yaml + - test -f {{.BOOTSTRAP_DIR}}/apps/templates/resources.yaml.j2 + - test -f {{.BOOTSTRAP_DIR}}/apps/templates/wipe-rook.yaml.gotmpl - which curl jq helmfile kubectl op talosctl diff --git a/.taskfiles/kubernetes/Taskfile.yaml b/.taskfiles/kubernetes/Taskfile.yaml index ecf40d98f8b77..7767c31e04e63 100644 --- a/.taskfiles/kubernetes/Taskfile.yaml +++ b/.taskfiles/kubernetes/Taskfile.yaml @@ -5,7 +5,7 @@ version: '3' tasks: ks-*: - desc: Apply a Flux KS for a cluster [CLUSTER=main] [PATH=required] + desc: Apply a Flux KS for a cluster [PATH=required] cmd: > flux build --namespace flux-system ks {{base .PATH}} --kustomization-file {{.CLUSTER_DIR}}/apps/{{.PATH}}/ks.yaml @@ -13,7 +13,7 @@ tasks: | yq 'with(select(.apiVersion == "kustomize.toolkit.fluxcd.io/v1" and .kind == "Kustomization"); .metadata.namespace = "flux-system")' - | kubectl {{.OPERATION}} {{if eq .OPERATION "apply"}}--server-side --field-manager=kustomize-controller{{end}} --filename - requires: - vars: [CLUSTER, PATH] + vars: [PATH] vars: OPERATION: '{{index .MATCH 0}}' KUSTOMIZATION: @@ -23,53 +23,47 @@ tasks: - which flux kubectl yq browse-pvc: - desc: Mount a PVC to an temp container [CLUSTER=main] [NS=default] [CLAIM=required] + desc: Mount a PVC to an temp container [NS=default] [CLAIM=required] interactive: true cmd: kubectl browse-pvc --namespace {{.NS}} --image docker.io/library/alpine:latest {{.CLAIM}} vars: NS: '{{.NS | default "default"}}' requires: - vars: [CLUSTER, CLAIM] + vars: [CLAIM] preconditions: - kubectl --namespace {{.NS}} get persistentvolumeclaims {{.CLAIM}} - kubectl browse-pvc --version - which kubectl sync-secrets: - desc: Sync all ExternalSecrets [CLUSTER=main] + desc: Sync all ExternalSecrets cmds: - for: { var: SECRETS, split: "\n" } cmd: kubectl --namespace {{splitList "," .ITEM | first}} annotate externalsecret {{splitList "," .ITEM | last}} force-sync="{{now | unixEpoch}}" --overwrite vars: SECRETS: sh: kubectl get externalsecret --all-namespaces --no-headers --output=jsonpath='{range .items[*]}{.metadata.namespace},{.metadata.name}{"\n"}{end}' - requires: - vars: [CLUSTER] preconditions: - which kubectl cleanse-pods: - desc: Cleanse pods with a Failed/Pending/Succeeded phase [CLUSTER=main] + desc: Cleanse pods with a Failed/Pending/Succeeded phase cmds: - for: matrix: PHASE: [Failed, Pending, Succeeded] cmd: kubectl delete pods --all-namespaces --field-selector status.phase={{.ITEM.PHASE}} --ignore-not-found=true - requires: - vars: [CLUSTER] preconditions: - which kubectl # https://docs.github.com/en/enterprise-cloud@latest/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller#upgrading-arc upgrade-arc: - desc: Upgrade the ARC [CLUSTER=main] + desc: Upgrade the ARC cmds: - helm -n actions-runner-system uninstall gha-runner-scale-set - helm -n actions-runner-system uninstall gha-runner-scale-set-controller - sleep 5 - flux -n actions-runner-system reconcile hr gha-runner-scale-set-controller - flux -n actions-runner-system reconcile hr gha-runner-scale-set - requires: - vars: [CLUSTER] preconditions: - which flux helm diff --git a/.taskfiles/talos/Taskfile.yaml b/.taskfiles/talos/Taskfile.yaml index 948179dc75e0d..0f62548b9d62a 100644 --- a/.taskfiles/talos/Taskfile.yaml +++ b/.taskfiles/talos/Taskfile.yaml @@ -5,27 +5,27 @@ version: '3' tasks: apply-node: - desc: Apply Talos config to a node [CLUSTER=main] [IP=required] - dotenv: ['{{.CLUSTER_DIR}}/cluster.env'] + desc: Apply Talos config to a node [IP=required] + dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env'] cmds: - task: down - - sops exec-file --input-type yaml --output-type yaml {{.CLUSTER_DIR}}/talos/{{.IP}}.sops.yaml.j2 "minijinja-cli {}" | talosctl --nodes {{.IP}} apply-config --mode={{.MODE}} --file /dev/stdin + - sops exec-file --input-type yaml --output-type yaml {{.BOOTSTRAP_DIR}}/talos/{{.IP}}.sops.yaml.j2 "minijinja-cli {}" | talosctl --nodes {{.IP}} apply-config --mode={{.MODE}} --file /dev/stdin - talosctl --nodes {{.IP}} health - task: up vars: MODE: '{{.MODE | default "auto"}}' requires: - vars: [CLUSTER, IP] + vars: [IP] preconditions: - talosctl --nodes {{.IP}} get machineconfig - - test -f {{.CLUSTER_DIR}}/cluster.env - - test -f {{.CLUSTER_DIR}}/talos/{{.IP}}.sops.yaml.j2 + - test -f {{.BOOTSTRAP_DIR}}/.cluster.env + - test -f {{.BOOTSTRAP_DIR}}/talos/{{.IP}}.sops.yaml.j2 - test -f {{.CLUSTER_DIR}}/talosconfig - which minijinja-cli sops talosctl upgrade-node: - desc: Upgrade Talos on a single node [CLUSTER=main] [IP=required] - dotenv: ['{{.CLUSTER_DIR}}/cluster.env'] + desc: Upgrade Talos on a single node [IP=required] + dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env'] cmds: - task: down - talosctl --nodes {{.IP}} upgrade --image="factory.talos.dev/installer/{{.TALOS_SCHEMATIC_ID}}:$TALOS_VERSION" --timeout=10m @@ -35,18 +35,18 @@ tasks: TALOS_SCHEMATIC_ID: sh: talosctl --nodes {{.IP}} get nodeannotationspecs --output json | jq --raw-output '.spec | select(.key == "extensions.talos.dev/schematic") | .value' requires: - vars: [CLUSTER, IP] + vars: [IP] preconditions: - curl -fsSL -o /dev/null --fail https://github.com/siderolabs/talos/releases/tag/$TALOS_VERSION - talosctl --nodes {{.IP}} get machineconfig - talosctl config info - - test -f {{.CLUSTER_DIR}}/cluster.env + - test -f {{.BOOTSTRAP_DIR}}/.cluster.env - test -f {{.CLUSTER_DIR}}/talosconfig - which jq kubectl talosctl upgrade-k8s: - desc: Upgrade Kubernetes across the whole cluster [CLUSTER=main] [VERSION=required] - dotenv: ['{{.CLUSTER_DIR}}/cluster.env'] + desc: Upgrade Kubernetes across the whole cluster [VERSION=required] + dotenv: ['{{.BOOTSTRAP_DIR}}/.cluster.env'] cmds: - task: down - talosctl --nodes {{.TALOS_CONTROLLER}} upgrade-k8s --to $KUBERNETES_VERSION @@ -54,18 +54,16 @@ tasks: vars: TALOS_CONTROLLER: sh: talosctl config info --output json | jq --raw-output '.endpoints[]' | shuf -n 1 - requires: - vars: [CLUSTER] preconditions: - curl -fsSL -o /dev/null --fail https://github.com/siderolabs/kubelet/releases/tag/$KUBERNETES_VERSION - talosctl --nodes {{.TALOS_CONTROLLER}} get machineconfig - talosctl config info - - test -f {{.CLUSTER_DIR}}/cluster.env + - test -f {{.BOOTSTRAP_DIR}}/.cluster.env - test -f {{.CLUSTER_DIR}}/talosconfig - which jq talosctl reboot-node: - desc: Reboot Talos on a single node [CLUSTER=main] [IP=required] [MODE=default] + desc: Reboot Talos on a single node [IP=required] [MODE=default] cmds: - task: down - talosctl --nodes {{.IP}} reboot --mode={{.MODE}} @@ -74,23 +72,21 @@ tasks: vars: MODE: '{{.MODE | default "default"}}' requires: - vars: [CLUSTER, IP] + vars: [IP] preconditions: - talosctl --nodes {{.IP}} get machineconfig - talosctl config info - - test -f {{.CLUSTER_DIR}}/cluster.env + - test -f {{.BOOTSTRAP_DIR}}/.cluster.env - test -f {{.CLUSTER_DIR}}/talosconfig - which talosctl shutdown-cluster: - desc: Shutdown Talos across the whole cluster [CLUSTER=main] - prompt: Shutdown the Talos cluster '{{.CLUSTER}}' ... continue? + desc: Shutdown Talos across the whole cluster + prompt: Shutdown the Talos cluster ... continue? cmd: talosctl shutdown --nodes {{.IP_ADDRS}} --force vars: IP_ADDRS: sh: talosctl config info --output json | jq --join-output '[.nodes[]] | join(",")' - requires: - vars: [CLUSTER] preconditions: - talosctl --nodes {{.NODES}} get machineconfig - talosctl config info @@ -98,11 +94,11 @@ tasks: - which jq talosctl reset-node: - desc: Reset Talos on a single node [CLUSTER=main] [IP=required] - prompt: Reset Talos node '{{.IP}}' on the '{{.CLUSTER}}' cluster ... continue? + desc: Reset Talos on a single node [IP=required] + prompt: Reset Talos node '{{.IP}}' ... continue? cmd: talosctl reset --nodes {{.IP}} --graceful=false requires: - vars: [CLUSTER, IP] + vars: [IP] preconditions: - talosctl --nodes {{.IP}} get machineconfig - talosctl config info @@ -110,14 +106,12 @@ tasks: - which talosctl reset-cluster: - desc: Reset Talos across the whole cluster [CLUSTER=main] - prompt: Reset the Talos cluster '{{.CLUSTER}}' ... continue? + desc: Reset Talos across the whole cluster + prompt: Reset the Talos cluster ... continue? cmd: talosctl reset --nodes {{.IP_ADDRS}} --graceful=false vars: IP_ADDRS: sh: talosctl config info --output json | jq --join-output '[.nodes[]] | join(",")' - requires: - vars: [CLUSTER] preconditions: - talosctl --nodes {{.NODES}} get machineconfig - talosctl config info @@ -125,66 +119,55 @@ tasks: - which jq talosctl kubeconfig: - desc: Generate the kubeconfig for a Talos cluster [CLUSTER=main] - cmd: talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name {{.CLUSTER}} {{.CLUSTER_DIR}} + desc: Generate the kubeconfig for a Talos cluster + cmd: talosctl kubeconfig --nodes {{.TALOS_CONTROLLER}} --force --force-context-name main {{.CLUSTER_DIR}} vars: TALOS_CONTROLLER: sh: talosctl config info --output json | jq --raw-output '.endpoints[]' | shuf -n 1 - requires: - vars: [CLUSTER] preconditions: - talosctl config info - test -f {{.CLUSTER_DIR}}/talosconfig - which jq talosctl apply-cluster: - desc: Apply Talos config across the whole cluster [CLUSTER=main] [MODE=default] + desc: Apply Talos config across the whole cluster [MODE=default] cmds: - for: { var: IP_ADDRS } task: apply-node vars: IP: '{{.ITEM}}' MODE: '{{.MODE}}' - CLUSTER: '{{.CLUSTER}}' vars: MODE: '{{.MODE | default "auto"}}' IP_ADDRS: sh: talosctl config info --output json | jq --join-output '[.nodes[]] | join(" ")' - requires: - vars: [CLUSTER] preconditions: - which jq talosctl upgrade-cluster: - desc: Upgrade Talos across the whole cluster [CLUSTER=main] + desc: Upgrade Talos across the whole cluster cmds: - for: { var: IP_ADDRS } task: upgrade-node vars: IP: '{{.ITEM}}' - CLUSTER: '{{.CLUSTER}}' vars: IP_ADDRS: sh: talosctl config info --output json | jq --join-output '[.nodes[]] | join(" ")' - requires: - vars: [CLUSTER] preconditions: - which jq talosctl reboot-cluster: - desc: Reboot Talos on a single node [CLUSTER=main] [IP=required] [MODE=default] + desc: Reboot Talos on a single node [IP=required] [MODE=default] cmds: - for: { var: IP_ADDRS } task: reboot-node vars: IP: '{{.ITEM}}' MODE: '{{.MODE}}' - CLUSTER: '{{.CLUSTER}}' vars: IP_ADDRS: sh: talosctl config info --output json | jq --join-output '[.nodes[]] | join(" ")' - requires: - vars: [CLUSTER] preconditions: - which jq talosctl diff --git a/.taskfiles/volsync/Taskfile.yaml b/.taskfiles/volsync/Taskfile.yaml index d3ddd0ffde3da..c10f447f81a36 100644 --- a/.taskfiles/volsync/Taskfile.yaml +++ b/.taskfiles/volsync/Taskfile.yaml @@ -13,34 +13,30 @@ vars: tasks: state-*: - desc: Suspend or resume Volsync [CLUSTER=main] + desc: Suspend or resume Volsync cmds: - flux --namespace flux-system {{.STATE}} kustomization volsync - flux --namespace volsync-system {{.STATE}} helmrelease volsync - kubectl --namespace volsync-system scale deployment volsync --replicas {{if eq .STATE "suspend"}}0{{else}}1{{end}} vars: STATE: '{{index .MATCH 0}}' - requires: - vars: [CLUSTER] preconditions: - '[[ "{{.STATE}}" == "suspend" || "{{.STATE}}" == "resume" ]]' - which flux kubectl unlock: - desc: Unlock all restic source repos [CLUSTER=main] + desc: Unlock all restic source repos cmds: - for: { var: SOURCES, split: "\n" } cmd: kubectl --namespace {{splitList "," .ITEM | first}} patch --field-manager=flux-client-side-apply replicationsources {{splitList "," .ITEM | last}} --type merge --patch "{\"spec\":{\"restic\":{\"unlock\":\"{{now | unixEpoch}}\"}}}" vars: SOURCES: sh: kubectl get replicationsources --all-namespaces --no-headers --output=jsonpath='{range .items[*]}{.metadata.namespace},{.metadata.name}{"\n"}{end}' - requires: - vars: [CLUSTER] preconditions: - which kubectl snapshot: - desc: Snapshot an app [CLUSTER=main] [NS=default] [APP=required] + desc: Snapshot an app [NS=default] [APP=required] cmds: - kubectl --namespace {{.NS}} patch replicationsources {{.APP}} --type merge -p '{"spec":{"trigger":{"manual":"{{now | unixEpoch}}"}}}' - until kubectl --namespace {{.NS}} get job/{{.JOB}} &>/dev/null; do sleep 5; done @@ -49,13 +45,13 @@ tasks: NS: '{{.NS | default "default"}}' JOB: volsync-src-{{.APP}} requires: - vars: [CLUSTER, APP] + vars: [APP] preconditions: - kubectl --namespace {{.NS}} get replicationsources {{.APP}} - which kubectl restore: - desc: Restore an app [CLUSTER=main] [NS=default] [APP=required] [PREVIOUS=required] + desc: Restore an app [NS=default] [APP=required] [PREVIOUS=required] cmds: # Suspend - flux --namespace flux-system suspend kustomization {{.APP}} @@ -91,13 +87,13 @@ tasks: PGID: sh: kubectl --namespace {{.NS}} get replicationsources/{{.APP}} --output=jsonpath="{.spec.restic.moverSecurityContext.runAsGroup}" requires: - vars: [CLUSTER, APP, PREVIOUS] + vars: [APP, PREVIOUS] preconditions: - test -f {{.VOLSYNC_RESOURCES_DIR}}/replicationdestination.yaml.j2 - which flux kubectl minijinja-cli unlock-local: - desc: Unlock a restic source repo from local machine [CLUSTER=main] [NS=default] [APP=required] + desc: Unlock a restic source repo from local machine [NS=default] [APP=required] cmds: - minijinja-cli {{.VOLSYNC_RESOURCES_DIR}}/unlock.yaml.j2 | kubectl apply --server-side --filename - - until kubectl --namespace {{.NS}} get job/volsync-unlock-{{.APP}} &>/dev/null; do sleep 5; done @@ -110,7 +106,7 @@ tasks: NS: '{{.NS}}' APP: '{{.APP}}' requires: - vars: [CLUSTER, APP] + vars: [APP] preconditions: - test -f {{.VOLSYNC_RESOURCES_DIR}}/unlock.yaml.j2 - which kubectl minijinja-cli stern diff --git a/Taskfile.yaml b/Taskfile.yaml index 13f896f6c7cb3..c85be136fe7ab 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -6,8 +6,8 @@ set: [pipefail] shopt: [globstar] vars: - CLUSTER: '{{.CLUSTER | default "main"}}' - CLUSTER_DIR: '{{.ROOT_DIR}}/kubernetes/{{.CLUSTER}}' + CLUSTER_DIR: '{{.ROOT_DIR}}/kubernetes' + BOOTSTRAP_DIR: '{{.CLUSTER_DIR}}/bootstrap' env: KUBECONFIG: '{{.CLUSTER_DIR}}/kubeconfig' diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app/externalsecret.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app/externalsecret.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app/externalsecret.yaml diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app/helmrelease.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app/helmrelease.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app/helmrelease.yaml diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app/kustomization.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app/kustomization.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app/kustomization.yaml diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml similarity index 86% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml index d45e3fc8205e7..97ce351929e6d 100644 --- a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml +++ b/kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/actions-runner-system/gha-runner-scale-set-controller/app + path: ./kubernetes/apps/actions-runner-system/gha-runner-scale-set-controller/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app/helmrelease.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app/helmrelease.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set/app/helmrelease.yaml diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app/kustomization.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app/kustomization.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set/app/kustomization.yaml diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app/rbac.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set/app/rbac.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app/rbac.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set/app/rbac.yaml diff --git a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/ks.yaml b/kubernetes/apps/actions-runner-system/gha-runner-scale-set/ks.yaml similarity index 86% rename from kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/ks.yaml rename to kubernetes/apps/actions-runner-system/gha-runner-scale-set/ks.yaml index 4c3c615238d36..9803179afd7b6 100644 --- a/kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/ks.yaml +++ b/kubernetes/apps/actions-runner-system/gha-runner-scale-set/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/actions-runner-system/gha-runner-scale-set/app + path: ./kubernetes/apps/actions-runner-system/gha-runner-scale-set/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/actions-runner-system/kustomization.yaml b/kubernetes/apps/actions-runner-system/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/kustomization.yaml rename to kubernetes/apps/actions-runner-system/kustomization.yaml diff --git a/kubernetes/main/apps/actions-runner-system/namespace.yaml b/kubernetes/apps/actions-runner-system/namespace.yaml similarity index 100% rename from kubernetes/main/apps/actions-runner-system/namespace.yaml rename to kubernetes/apps/actions-runner-system/namespace.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/app/helmrelease.yaml b/kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/cert-manager/app/helmrelease.yaml rename to kubernetes/apps/cert-manager/cert-manager/app/helmrelease.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/app/kustomization.yaml b/kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/cert-manager/app/kustomization.yaml rename to kubernetes/apps/cert-manager/cert-manager/app/kustomization.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/app/prometheusrule.yaml b/kubernetes/apps/cert-manager/cert-manager/app/prometheusrule.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/cert-manager/app/prometheusrule.yaml rename to kubernetes/apps/cert-manager/cert-manager/app/prometheusrule.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/issuers/externalsecret.yaml b/kubernetes/apps/cert-manager/cert-manager/issuers/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/cert-manager/issuers/externalsecret.yaml rename to kubernetes/apps/cert-manager/cert-manager/issuers/externalsecret.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/issuers/issuers.yaml b/kubernetes/apps/cert-manager/cert-manager/issuers/issuers.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/cert-manager/issuers/issuers.yaml rename to kubernetes/apps/cert-manager/cert-manager/issuers/issuers.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/issuers/kustomization.yaml b/kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/cert-manager/issuers/kustomization.yaml rename to kubernetes/apps/cert-manager/cert-manager/issuers/kustomization.yaml diff --git a/kubernetes/main/apps/cert-manager/cert-manager/ks.yaml b/kubernetes/apps/cert-manager/cert-manager/ks.yaml similarity index 89% rename from kubernetes/main/apps/cert-manager/cert-manager/ks.yaml rename to kubernetes/apps/cert-manager/cert-manager/ks.yaml index 86d7531644d3c..c5822421b5e4b 100644 --- a/kubernetes/main/apps/cert-manager/cert-manager/ks.yaml +++ b/kubernetes/apps/cert-manager/cert-manager/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/cert-manager/cert-manager/app + path: ./kubernetes/apps/cert-manager/cert-manager/app prune: false # revert to true sourceRef: kind: GitRepository @@ -33,7 +33,7 @@ spec: dependsOn: - name: cert-manager - name: external-secrets-stores - path: ./kubernetes/main/apps/cert-manager/cert-manager/issuers + path: ./kubernetes/apps/cert-manager/cert-manager/issuers prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/cert-manager/kustomization.yaml b/kubernetes/apps/cert-manager/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/kustomization.yaml rename to kubernetes/apps/cert-manager/kustomization.yaml diff --git a/kubernetes/main/apps/cert-manager/namespace.yaml b/kubernetes/apps/cert-manager/namespace.yaml similarity index 100% rename from kubernetes/main/apps/cert-manager/namespace.yaml rename to kubernetes/apps/cert-manager/namespace.yaml diff --git a/kubernetes/main/apps/default/atuin/app/helmrelease.yaml b/kubernetes/apps/default/atuin/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/atuin/app/helmrelease.yaml rename to kubernetes/apps/default/atuin/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/pinchflat/app/kustomization.yaml b/kubernetes/apps/default/atuin/app/kustomization.yaml similarity index 65% rename from kubernetes/main/apps/default/pinchflat/app/kustomization.yaml rename to kubernetes/apps/default/atuin/app/kustomization.yaml index eff822ae3e408..170a3795c0002 100644 --- a/kubernetes/main/apps/default/pinchflat/app/kustomization.yaml +++ b/kubernetes/apps/default/atuin/app/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/atuin/ks.yaml b/kubernetes/apps/default/atuin/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/atuin/ks.yaml rename to kubernetes/apps/default/atuin/ks.yaml index a1a2803989bd0..52df21d4b0f58 100644 --- a/kubernetes/main/apps/default/atuin/ks.yaml +++ b/kubernetes/apps/default/atuin/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: volsync - path: ./kubernetes/main/apps/default/atuin/app + path: ./kubernetes/apps/default/atuin/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/autobrr/app/externalsecret.yaml b/kubernetes/apps/default/autobrr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/autobrr/app/externalsecret.yaml rename to kubernetes/apps/default/autobrr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/autobrr/app/helmrelease.yaml b/kubernetes/apps/default/autobrr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/autobrr/app/helmrelease.yaml rename to kubernetes/apps/default/autobrr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/autobrr/app/kustomization.yaml b/kubernetes/apps/default/autobrr/app/kustomization.yaml similarity index 81% rename from kubernetes/main/apps/default/autobrr/app/kustomization.yaml rename to kubernetes/apps/default/autobrr/app/kustomization.yaml index 8eed10c5da0ec..07f496789ce61 100644 --- a/kubernetes/main/apps/default/autobrr/app/kustomization.yaml +++ b/kubernetes/apps/default/autobrr/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: autobrr-loki-rules files: diff --git a/kubernetes/main/apps/default/autobrr/app/resources/lokirule.yaml b/kubernetes/apps/default/autobrr/app/resources/lokirule.yaml similarity index 100% rename from kubernetes/main/apps/default/autobrr/app/resources/lokirule.yaml rename to kubernetes/apps/default/autobrr/app/resources/lokirule.yaml diff --git a/kubernetes/main/apps/default/autobrr/ks.yaml b/kubernetes/apps/default/autobrr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/autobrr/ks.yaml rename to kubernetes/apps/default/autobrr/ks.yaml index efa5706e12d63..30be92e32de48 100644 --- a/kubernetes/main/apps/default/autobrr/ks.yaml +++ b/kubernetes/apps/default/autobrr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/autobrr/app + path: ./kubernetes/apps/default/autobrr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/bazarr/app/externalsecret.yaml b/kubernetes/apps/default/bazarr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/bazarr/app/externalsecret.yaml rename to kubernetes/apps/default/bazarr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/bazarr/app/helmrelease.yaml b/kubernetes/apps/default/bazarr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/bazarr/app/helmrelease.yaml rename to kubernetes/apps/default/bazarr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/bazarr/app/kustomization.yaml b/kubernetes/apps/default/bazarr/app/kustomization.yaml similarity index 81% rename from kubernetes/main/apps/default/bazarr/app/kustomization.yaml rename to kubernetes/apps/default/bazarr/app/kustomization.yaml index e04f5a131582f..443f3c8db3b1c 100644 --- a/kubernetes/main/apps/default/bazarr/app/kustomization.yaml +++ b/kubernetes/apps/default/bazarr/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: bazarr-scripts files: diff --git a/kubernetes/main/apps/default/bazarr/app/resources/subcleaner.sh b/kubernetes/apps/default/bazarr/app/resources/subcleaner.sh similarity index 100% rename from kubernetes/main/apps/default/bazarr/app/resources/subcleaner.sh rename to kubernetes/apps/default/bazarr/app/resources/subcleaner.sh diff --git a/kubernetes/main/apps/default/bazarr/ks.yaml b/kubernetes/apps/default/bazarr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/bazarr/ks.yaml rename to kubernetes/apps/default/bazarr/ks.yaml index a9b9e4a3177f7..de0e465b11d41 100644 --- a/kubernetes/main/apps/default/bazarr/ks.yaml +++ b/kubernetes/apps/default/bazarr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/bazarr/app + path: ./kubernetes/apps/default/bazarr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/cross-seed/app/externalsecret.yaml b/kubernetes/apps/default/cross-seed/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/cross-seed/app/externalsecret.yaml rename to kubernetes/apps/default/cross-seed/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/cross-seed/app/helmrelease.yaml b/kubernetes/apps/default/cross-seed/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/cross-seed/app/helmrelease.yaml rename to kubernetes/apps/default/cross-seed/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/cross-seed/app/kustomization.yaml b/kubernetes/apps/default/cross-seed/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/cross-seed/app/kustomization.yaml rename to kubernetes/apps/default/cross-seed/app/kustomization.yaml diff --git a/kubernetes/main/apps/default/cross-seed/app/resources/lokirule.yaml b/kubernetes/apps/default/cross-seed/app/resources/lokirule.yaml similarity index 100% rename from kubernetes/main/apps/default/cross-seed/app/resources/lokirule.yaml rename to kubernetes/apps/default/cross-seed/app/resources/lokirule.yaml diff --git a/kubernetes/main/apps/default/cross-seed/ks.yaml b/kubernetes/apps/default/cross-seed/ks.yaml similarity index 91% rename from kubernetes/main/apps/default/cross-seed/ks.yaml rename to kubernetes/apps/default/cross-seed/ks.yaml index 482ab362e3135..0b48eda296181 100644 --- a/kubernetes/main/apps/default/cross-seed/ks.yaml +++ b/kubernetes/apps/default/cross-seed/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/default/cross-seed/app + path: ./kubernetes/apps/default/cross-seed/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/emqx/app/externalsecret.yaml b/kubernetes/apps/default/emqx/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/app/externalsecret.yaml rename to kubernetes/apps/default/emqx/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/emqx/app/helmrelease.yaml b/kubernetes/apps/default/emqx/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/app/helmrelease.yaml rename to kubernetes/apps/default/emqx/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/emqx/app/kustomization.yaml b/kubernetes/apps/default/emqx/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/app/kustomization.yaml rename to kubernetes/apps/default/emqx/app/kustomization.yaml diff --git a/kubernetes/main/apps/default/emqx/cluster/cluster.yaml b/kubernetes/apps/default/emqx/cluster/cluster.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/cluster/cluster.yaml rename to kubernetes/apps/default/emqx/cluster/cluster.yaml diff --git a/kubernetes/main/apps/default/emqx/cluster/gatus.yaml b/kubernetes/apps/default/emqx/cluster/gatus.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/cluster/gatus.yaml rename to kubernetes/apps/default/emqx/cluster/gatus.yaml diff --git a/kubernetes/main/apps/default/emqx/cluster/ingress.yaml b/kubernetes/apps/default/emqx/cluster/ingress.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/cluster/ingress.yaml rename to kubernetes/apps/default/emqx/cluster/ingress.yaml diff --git a/kubernetes/main/apps/default/emqx/cluster/kustomization.yaml b/kubernetes/apps/default/emqx/cluster/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/cluster/kustomization.yaml rename to kubernetes/apps/default/emqx/cluster/kustomization.yaml diff --git a/kubernetes/main/apps/default/emqx/cluster/podmonitor.yaml b/kubernetes/apps/default/emqx/cluster/podmonitor.yaml similarity index 100% rename from kubernetes/main/apps/default/emqx/cluster/podmonitor.yaml rename to kubernetes/apps/default/emqx/cluster/podmonitor.yaml diff --git a/kubernetes/main/apps/default/emqx/ks.yaml b/kubernetes/apps/default/emqx/ks.yaml similarity index 91% rename from kubernetes/main/apps/default/emqx/ks.yaml rename to kubernetes/apps/default/emqx/ks.yaml index 4f8cc53582605..a0a1dbb43d92f 100644 --- a/kubernetes/main/apps/default/emqx/ks.yaml +++ b/kubernetes/apps/default/emqx/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/default/emqx/app + path: ./kubernetes/apps/default/emqx/app prune: false # revert to true sourceRef: kind: GitRepository @@ -34,7 +34,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: emqx - path: ./kubernetes/main/apps/default/emqx/cluster + path: ./kubernetes/apps/default/emqx/cluster prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/go2rtc/app/helmrelease.yaml b/kubernetes/apps/default/go2rtc/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/go2rtc/app/helmrelease.yaml rename to kubernetes/apps/default/go2rtc/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/go2rtc/app/kustomization.yaml b/kubernetes/apps/default/go2rtc/app/kustomization.yaml similarity index 86% rename from kubernetes/main/apps/default/go2rtc/app/kustomization.yaml rename to kubernetes/apps/default/go2rtc/app/kustomization.yaml index 20d76e020f55f..dcbc6da4bcc14 100644 --- a/kubernetes/main/apps/default/go2rtc/app/kustomization.yaml +++ b/kubernetes/apps/default/go2rtc/app/kustomization.yaml @@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded + - ../../../../templates/gatus/guarded configMapGenerator: - name: go2rtc-configmap files: diff --git a/kubernetes/main/apps/default/go2rtc/app/resources/go2rtc.yaml b/kubernetes/apps/default/go2rtc/app/resources/go2rtc.yaml similarity index 100% rename from kubernetes/main/apps/default/go2rtc/app/resources/go2rtc.yaml rename to kubernetes/apps/default/go2rtc/app/resources/go2rtc.yaml diff --git a/kubernetes/main/apps/default/go2rtc/ks.yaml b/kubernetes/apps/default/go2rtc/ks.yaml similarity index 91% rename from kubernetes/main/apps/default/go2rtc/ks.yaml rename to kubernetes/apps/default/go2rtc/ks.yaml index 8b8a0b0c5fb0c..4b220cc44c10f 100644 --- a/kubernetes/main/apps/default/go2rtc/ks.yaml +++ b/kubernetes/apps/default/go2rtc/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/default/go2rtc/app + path: ./kubernetes/apps/default/go2rtc/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/home-assistant/app/externalsecret.yaml b/kubernetes/apps/default/home-assistant/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/home-assistant/app/externalsecret.yaml rename to kubernetes/apps/default/home-assistant/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/home-assistant/app/helmrelease.yaml b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/home-assistant/app/helmrelease.yaml rename to kubernetes/apps/default/home-assistant/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/jellyseerr/app/kustomization.yaml b/kubernetes/apps/default/home-assistant/app/kustomization.yaml similarity index 69% rename from kubernetes/main/apps/default/jellyseerr/app/kustomization.yaml rename to kubernetes/apps/default/home-assistant/app/kustomization.yaml index 029d798c0a6d1..7d4fd6d6ead24 100644 --- a/kubernetes/main/apps/default/jellyseerr/app/kustomization.yaml +++ b/kubernetes/apps/default/home-assistant/app/kustomization.yaml @@ -6,5 +6,5 @@ resources: - ./externalsecret.yaml - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/external - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/external + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/home-assistant/app/pvc.yaml b/kubernetes/apps/default/home-assistant/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/home-assistant/app/pvc.yaml rename to kubernetes/apps/default/home-assistant/app/pvc.yaml diff --git a/kubernetes/main/apps/default/home-assistant/ks.yaml b/kubernetes/apps/default/home-assistant/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/home-assistant/ks.yaml rename to kubernetes/apps/default/home-assistant/ks.yaml index 3374a9fb9d436..b33cb9049fe62 100644 --- a/kubernetes/main/apps/default/home-assistant/ks.yaml +++ b/kubernetes/apps/default/home-assistant/ks.yaml @@ -14,7 +14,7 @@ spec: - name: emqx-cluster - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/home-assistant/app + path: ./kubernetes/apps/default/home-assistant/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/jellyseerr/app/externalsecret.yaml b/kubernetes/apps/default/jellyseerr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/jellyseerr/app/externalsecret.yaml rename to kubernetes/apps/default/jellyseerr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/jellyseerr/app/helmrelease.yaml b/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/jellyseerr/app/helmrelease.yaml rename to kubernetes/apps/default/jellyseerr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/home-assistant/app/kustomization.yaml b/kubernetes/apps/default/jellyseerr/app/kustomization.yaml similarity index 69% rename from kubernetes/main/apps/default/home-assistant/app/kustomization.yaml rename to kubernetes/apps/default/jellyseerr/app/kustomization.yaml index 029d798c0a6d1..7d4fd6d6ead24 100644 --- a/kubernetes/main/apps/default/home-assistant/app/kustomization.yaml +++ b/kubernetes/apps/default/jellyseerr/app/kustomization.yaml @@ -6,5 +6,5 @@ resources: - ./externalsecret.yaml - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/external - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/external + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/jellyseerr/app/pvc.yaml b/kubernetes/apps/default/jellyseerr/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/jellyseerr/app/pvc.yaml rename to kubernetes/apps/default/jellyseerr/app/pvc.yaml diff --git a/kubernetes/main/apps/default/jellyseerr/ks.yaml b/kubernetes/apps/default/jellyseerr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/jellyseerr/ks.yaml rename to kubernetes/apps/default/jellyseerr/ks.yaml index 43cc3bb21a9ab..07e680d0c34fc 100644 --- a/kubernetes/main/apps/default/jellyseerr/ks.yaml +++ b/kubernetes/apps/default/jellyseerr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/jellyseerr/app + path: ./kubernetes/apps/default/jellyseerr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/kustomization.yaml rename to kubernetes/apps/default/kustomization.yaml diff --git a/kubernetes/main/apps/default/namespace.yaml b/kubernetes/apps/default/namespace.yaml similarity index 100% rename from kubernetes/main/apps/default/namespace.yaml rename to kubernetes/apps/default/namespace.yaml diff --git a/kubernetes/main/apps/default/pinchflat/app/helmrelease.yaml b/kubernetes/apps/default/pinchflat/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/pinchflat/app/helmrelease.yaml rename to kubernetes/apps/default/pinchflat/app/helmrelease.yaml diff --git a/kubernetes/apps/default/pinchflat/app/kustomization.yaml b/kubernetes/apps/default/pinchflat/app/kustomization.yaml new file mode 100644 index 0000000000000..170a3795c0002 --- /dev/null +++ b/kubernetes/apps/default/pinchflat/app/kustomization.yaml @@ -0,0 +1,8 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./helmrelease.yaml + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/pinchflat/ks.yaml b/kubernetes/apps/default/pinchflat/ks.yaml similarity index 91% rename from kubernetes/main/apps/default/pinchflat/ks.yaml rename to kubernetes/apps/default/pinchflat/ks.yaml index e7a2b5291aaeb..968101fc74171 100644 --- a/kubernetes/main/apps/default/pinchflat/ks.yaml +++ b/kubernetes/apps/default/pinchflat/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: volsync - path: ./kubernetes/main/apps/default/pinchflat/app + path: ./kubernetes/apps/default/pinchflat/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/plex/app/helmrelease.yaml b/kubernetes/apps/default/plex/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/app/helmrelease.yaml rename to kubernetes/apps/default/plex/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/plex/app/kustomization.yaml b/kubernetes/apps/default/plex/app/kustomization.yaml similarity index 80% rename from kubernetes/main/apps/default/plex/app/kustomization.yaml rename to kubernetes/apps/default/plex/app/kustomization.yaml index 6ee34960ae4b2..d36e561aa89ca 100644 --- a/kubernetes/main/apps/default/plex/app/kustomization.yaml +++ b/kubernetes/apps/default/plex/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization resources: - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/external - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/external + - ../../../../templates/volsync configMapGenerator: - name: plex-loki-rules files: diff --git a/kubernetes/main/apps/default/plex/app/pvc.yaml b/kubernetes/apps/default/plex/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/app/pvc.yaml rename to kubernetes/apps/default/plex/app/pvc.yaml diff --git a/kubernetes/main/apps/default/plex/app/resources/lokirule.yaml b/kubernetes/apps/default/plex/app/resources/lokirule.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/app/resources/lokirule.yaml rename to kubernetes/apps/default/plex/app/resources/lokirule.yaml diff --git a/kubernetes/main/apps/default/plex/ks.yaml b/kubernetes/apps/default/plex/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/plex/ks.yaml rename to kubernetes/apps/default/plex/ks.yaml index 8609e14785aca..63eed5d2c58aa 100644 --- a/kubernetes/main/apps/default/plex/ks.yaml +++ b/kubernetes/apps/default/plex/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/plex/app + path: ./kubernetes/apps/default/plex/app prune: false # revert to true sourceRef: kind: GitRepository @@ -41,7 +41,7 @@ spec: targetNamespace: default dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/default/plex/tools + path: ./kubernetes/apps/default/plex/tools prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/plex/tools/kustomization.yaml b/kubernetes/apps/default/plex/tools/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/tools/kustomization.yaml rename to kubernetes/apps/default/plex/tools/kustomization.yaml diff --git a/kubernetes/main/apps/default/plex/tools/off-deck/externalsecret.yaml b/kubernetes/apps/default/plex/tools/off-deck/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/tools/off-deck/externalsecret.yaml rename to kubernetes/apps/default/plex/tools/off-deck/externalsecret.yaml diff --git a/kubernetes/main/apps/default/plex/tools/off-deck/helmrelease.yaml b/kubernetes/apps/default/plex/tools/off-deck/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/tools/off-deck/helmrelease.yaml rename to kubernetes/apps/default/plex/tools/off-deck/helmrelease.yaml diff --git a/kubernetes/main/apps/default/plex/tools/off-deck/kustomization.yaml b/kubernetes/apps/default/plex/tools/off-deck/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/plex/tools/off-deck/kustomization.yaml rename to kubernetes/apps/default/plex/tools/off-deck/kustomization.yaml diff --git a/kubernetes/main/apps/default/prowlarr/app/externalsecret.yaml b/kubernetes/apps/default/prowlarr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/prowlarr/app/externalsecret.yaml rename to kubernetes/apps/default/prowlarr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/prowlarr/app/helmrelease.yaml rename to kubernetes/apps/default/prowlarr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/prowlarr/app/kustomization.yaml b/kubernetes/apps/default/prowlarr/app/kustomization.yaml similarity index 68% rename from kubernetes/main/apps/default/prowlarr/app/kustomization.yaml rename to kubernetes/apps/default/prowlarr/app/kustomization.yaml index 5afe3ff6d47ef..b5cc32d35ba97 100644 --- a/kubernetes/main/apps/default/prowlarr/app/kustomization.yaml +++ b/kubernetes/apps/default/prowlarr/app/kustomization.yaml @@ -5,5 +5,5 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/prowlarr/ks.yaml b/kubernetes/apps/default/prowlarr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/prowlarr/ks.yaml rename to kubernetes/apps/default/prowlarr/ks.yaml index 4b85dee215713..6442589d0eb4d 100644 --- a/kubernetes/main/apps/default/prowlarr/ks.yaml +++ b/kubernetes/apps/default/prowlarr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/prowlarr/app + path: ./kubernetes/apps/default/prowlarr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/qbittorrent/app/externalsecret.yaml b/kubernetes/apps/default/qbittorrent/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/app/externalsecret.yaml rename to kubernetes/apps/default/qbittorrent/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/app/helmrelease.yaml rename to kubernetes/apps/default/qbittorrent/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/qbittorrent/app/kustomization.yaml b/kubernetes/apps/default/qbittorrent/app/kustomization.yaml similarity index 86% rename from kubernetes/main/apps/default/qbittorrent/app/kustomization.yaml rename to kubernetes/apps/default/qbittorrent/app/kustomization.yaml index e139da6699221..6f7237d753cfc 100644 --- a/kubernetes/main/apps/default/qbittorrent/app/kustomization.yaml +++ b/kubernetes/apps/default/qbittorrent/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: qbittorrent-loki-rules files: diff --git a/kubernetes/main/apps/default/qbittorrent/app/resources/lokirule.yaml b/kubernetes/apps/default/qbittorrent/app/resources/lokirule.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/app/resources/lokirule.yaml rename to kubernetes/apps/default/qbittorrent/app/resources/lokirule.yaml diff --git a/kubernetes/main/apps/default/qbittorrent/app/resources/post-process.sh b/kubernetes/apps/default/qbittorrent/app/resources/post-process.sh similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/app/resources/post-process.sh rename to kubernetes/apps/default/qbittorrent/app/resources/post-process.sh diff --git a/kubernetes/main/apps/default/qbittorrent/ks.yaml b/kubernetes/apps/default/qbittorrent/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/qbittorrent/ks.yaml rename to kubernetes/apps/default/qbittorrent/ks.yaml index 95b2d4eb11c26..0f7a2e994d6d0 100644 --- a/kubernetes/main/apps/default/qbittorrent/ks.yaml +++ b/kubernetes/apps/default/qbittorrent/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/qbittorrent/app + path: ./kubernetes/apps/default/qbittorrent/app prune: false # revert to true sourceRef: kind: GitRepository @@ -44,7 +44,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/default/qbittorrent/tools + path: ./kubernetes/apps/default/qbittorrent/tools prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/qbittorrent/tools/externalsecret.yaml b/kubernetes/apps/default/qbittorrent/tools/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/tools/externalsecret.yaml rename to kubernetes/apps/default/qbittorrent/tools/externalsecret.yaml diff --git a/kubernetes/main/apps/default/qbittorrent/tools/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/tools/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/tools/helmrelease.yaml rename to kubernetes/apps/default/qbittorrent/tools/helmrelease.yaml diff --git a/kubernetes/main/apps/default/qbittorrent/tools/kustomization.yaml b/kubernetes/apps/default/qbittorrent/tools/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/tools/kustomization.yaml rename to kubernetes/apps/default/qbittorrent/tools/kustomization.yaml diff --git a/kubernetes/main/apps/default/qbittorrent/tools/qbtools-config.sops.yaml b/kubernetes/apps/default/qbittorrent/tools/qbtools-config.sops.yaml similarity index 100% rename from kubernetes/main/apps/default/qbittorrent/tools/qbtools-config.sops.yaml rename to kubernetes/apps/default/qbittorrent/tools/qbtools-config.sops.yaml diff --git a/kubernetes/main/apps/default/radarr/app/externalsecret.yaml b/kubernetes/apps/default/radarr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/radarr/app/externalsecret.yaml rename to kubernetes/apps/default/radarr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/radarr/app/helmrelease.yaml rename to kubernetes/apps/default/radarr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/radarr/app/kustomization.yaml b/kubernetes/apps/default/radarr/app/kustomization.yaml similarity index 82% rename from kubernetes/main/apps/default/radarr/app/kustomization.yaml rename to kubernetes/apps/default/radarr/app/kustomization.yaml index 4f35600fe73e3..aca7a4e7cd864 100644 --- a/kubernetes/main/apps/default/radarr/app/kustomization.yaml +++ b/kubernetes/apps/default/radarr/app/kustomization.yaml @@ -6,8 +6,8 @@ resources: - ./externalsecret.yaml - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: radarr-configmap files: diff --git a/kubernetes/main/apps/default/radarr/app/pvc.yaml b/kubernetes/apps/default/radarr/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/radarr/app/pvc.yaml rename to kubernetes/apps/default/radarr/app/pvc.yaml diff --git a/kubernetes/main/apps/default/radarr/app/resources/pushover-notifier.sh b/kubernetes/apps/default/radarr/app/resources/pushover-notifier.sh similarity index 100% rename from kubernetes/main/apps/default/radarr/app/resources/pushover-notifier.sh rename to kubernetes/apps/default/radarr/app/resources/pushover-notifier.sh diff --git a/kubernetes/main/apps/default/radarr/ks.yaml b/kubernetes/apps/default/radarr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/radarr/ks.yaml rename to kubernetes/apps/default/radarr/ks.yaml index 969589c25024b..4465461c8e304 100644 --- a/kubernetes/main/apps/default/radarr/ks.yaml +++ b/kubernetes/apps/default/radarr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/radarr/app + path: ./kubernetes/apps/default/radarr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/recyclarr/app/externalsecret.yaml b/kubernetes/apps/default/recyclarr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/recyclarr/app/externalsecret.yaml rename to kubernetes/apps/default/recyclarr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/recyclarr/app/helmrelease.yaml b/kubernetes/apps/default/recyclarr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/recyclarr/app/helmrelease.yaml rename to kubernetes/apps/default/recyclarr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/recyclarr/app/kustomization.yaml b/kubernetes/apps/default/recyclarr/app/kustomization.yaml similarity index 89% rename from kubernetes/main/apps/default/recyclarr/app/kustomization.yaml rename to kubernetes/apps/default/recyclarr/app/kustomization.yaml index b45d1812e3781..bdf68404927d7 100644 --- a/kubernetes/main/apps/default/recyclarr/app/kustomization.yaml +++ b/kubernetes/apps/default/recyclarr/app/kustomization.yaml @@ -5,7 +5,7 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/volsync + - ../../../../templates/volsync configMapGenerator: - name: recyclarr-configmap files: diff --git a/kubernetes/main/apps/default/recyclarr/app/resources/recyclarr.yml b/kubernetes/apps/default/recyclarr/app/resources/recyclarr.yml similarity index 100% rename from kubernetes/main/apps/default/recyclarr/app/resources/recyclarr.yml rename to kubernetes/apps/default/recyclarr/app/resources/recyclarr.yml diff --git a/kubernetes/main/apps/default/recyclarr/ks.yaml b/kubernetes/apps/default/recyclarr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/recyclarr/ks.yaml rename to kubernetes/apps/default/recyclarr/ks.yaml index 1b1158d102ee5..ab8cf9e44a395 100644 --- a/kubernetes/main/apps/default/recyclarr/ks.yaml +++ b/kubernetes/apps/default/recyclarr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/recyclarr/app + path: ./kubernetes/apps/default/recyclarr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/rtlamr2mqtt/app/externalsecret.yaml b/kubernetes/apps/default/rtlamr2mqtt/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/rtlamr2mqtt/app/externalsecret.yaml rename to kubernetes/apps/default/rtlamr2mqtt/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/rtlamr2mqtt/app/helmrelease.yaml b/kubernetes/apps/default/rtlamr2mqtt/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/rtlamr2mqtt/app/helmrelease.yaml rename to kubernetes/apps/default/rtlamr2mqtt/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/rtlamr2mqtt/app/kustomization.yaml b/kubernetes/apps/default/rtlamr2mqtt/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/rtlamr2mqtt/app/kustomization.yaml rename to kubernetes/apps/default/rtlamr2mqtt/app/kustomization.yaml diff --git a/kubernetes/main/apps/default/rtlamr2mqtt/ks.yaml b/kubernetes/apps/default/rtlamr2mqtt/ks.yaml similarity index 91% rename from kubernetes/main/apps/default/rtlamr2mqtt/ks.yaml rename to kubernetes/apps/default/rtlamr2mqtt/ks.yaml index 4fea7af941601..5aab047f128a5 100644 --- a/kubernetes/main/apps/default/rtlamr2mqtt/ks.yaml +++ b/kubernetes/apps/default/rtlamr2mqtt/ks.yaml @@ -14,7 +14,7 @@ spec: - name: emqx-cluster - name: external-secrets-stores - name: node-feature-discovery-rules - path: ./kubernetes/main/apps/default/rtlamr2mqtt/app + path: ./kubernetes/apps/default/rtlamr2mqtt/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/sabnzbd/app/externalsecret.yaml b/kubernetes/apps/default/sabnzbd/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/sabnzbd/app/externalsecret.yaml rename to kubernetes/apps/default/sabnzbd/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/sabnzbd/app/helmrelease.yaml rename to kubernetes/apps/default/sabnzbd/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/sabnzbd/app/kustomization.yaml b/kubernetes/apps/default/sabnzbd/app/kustomization.yaml similarity index 81% rename from kubernetes/main/apps/default/sabnzbd/app/kustomization.yaml rename to kubernetes/apps/default/sabnzbd/app/kustomization.yaml index 487c91d00ea05..ee2c5e6ffa07a 100644 --- a/kubernetes/main/apps/default/sabnzbd/app/kustomization.yaml +++ b/kubernetes/apps/default/sabnzbd/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: sabnzbd-scripts files: diff --git a/kubernetes/main/apps/default/sabnzbd/app/resources/post-process.sh b/kubernetes/apps/default/sabnzbd/app/resources/post-process.sh similarity index 100% rename from kubernetes/main/apps/default/sabnzbd/app/resources/post-process.sh rename to kubernetes/apps/default/sabnzbd/app/resources/post-process.sh diff --git a/kubernetes/main/apps/default/sabnzbd/ks.yaml b/kubernetes/apps/default/sabnzbd/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/sabnzbd/ks.yaml rename to kubernetes/apps/default/sabnzbd/ks.yaml index 217af580245cf..db56c0cd6ac47 100644 --- a/kubernetes/main/apps/default/sabnzbd/ks.yaml +++ b/kubernetes/apps/default/sabnzbd/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/sabnzbd/app + path: ./kubernetes/apps/default/sabnzbd/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/slskd/app/externalsecret.yaml b/kubernetes/apps/default/slskd/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/slskd/app/externalsecret.yaml rename to kubernetes/apps/default/slskd/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/slskd/app/helmrelease.yaml b/kubernetes/apps/default/slskd/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/slskd/app/helmrelease.yaml rename to kubernetes/apps/default/slskd/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/slskd/app/kustomization.yaml b/kubernetes/apps/default/slskd/app/kustomization.yaml similarity index 87% rename from kubernetes/main/apps/default/slskd/app/kustomization.yaml rename to kubernetes/apps/default/slskd/app/kustomization.yaml index 2663a2adffe07..0ebcb8e27ba51 100644 --- a/kubernetes/main/apps/default/slskd/app/kustomization.yaml +++ b/kubernetes/apps/default/slskd/app/kustomization.yaml @@ -6,7 +6,7 @@ resources: - ./externalsecret.yaml - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded + - ../../../../templates/gatus/guarded configMapGenerator: - name: slskd-configmap files: diff --git a/kubernetes/main/apps/default/slskd/app/pvc.yaml b/kubernetes/apps/default/slskd/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/slskd/app/pvc.yaml rename to kubernetes/apps/default/slskd/app/pvc.yaml diff --git a/kubernetes/main/apps/default/slskd/app/resources/slskd.yml b/kubernetes/apps/default/slskd/app/resources/slskd.yml similarity index 100% rename from kubernetes/main/apps/default/slskd/app/resources/slskd.yml rename to kubernetes/apps/default/slskd/app/resources/slskd.yml diff --git a/kubernetes/main/apps/default/slskd/ks.yaml b/kubernetes/apps/default/slskd/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/slskd/ks.yaml rename to kubernetes/apps/default/slskd/ks.yaml index ee23ea99d6e6b..64ce172f7bc9e 100644 --- a/kubernetes/main/apps/default/slskd/ks.yaml +++ b/kubernetes/apps/default/slskd/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/default/slskd/app + path: ./kubernetes/apps/default/slskd/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/sonarr/app/externalsecret.yaml b/kubernetes/apps/default/sonarr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/sonarr/app/externalsecret.yaml rename to kubernetes/apps/default/sonarr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/apps/default/sonarr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/sonarr/app/helmrelease.yaml rename to kubernetes/apps/default/sonarr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/sonarr/app/kustomization.yaml b/kubernetes/apps/default/sonarr/app/kustomization.yaml similarity index 85% rename from kubernetes/main/apps/default/sonarr/app/kustomization.yaml rename to kubernetes/apps/default/sonarr/app/kustomization.yaml index 5cad90558480b..4e4c7eac1e8f4 100644 --- a/kubernetes/main/apps/default/sonarr/app/kustomization.yaml +++ b/kubernetes/apps/default/sonarr/app/kustomization.yaml @@ -6,8 +6,8 @@ resources: - ./externalsecret.yaml - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: sonarr-configmap files: diff --git a/kubernetes/main/apps/default/sonarr/app/pvc.yaml b/kubernetes/apps/default/sonarr/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/sonarr/app/pvc.yaml rename to kubernetes/apps/default/sonarr/app/pvc.yaml diff --git a/kubernetes/main/apps/default/sonarr/app/resources/codec-tagger.sh b/kubernetes/apps/default/sonarr/app/resources/codec-tagger.sh similarity index 100% rename from kubernetes/main/apps/default/sonarr/app/resources/codec-tagger.sh rename to kubernetes/apps/default/sonarr/app/resources/codec-tagger.sh diff --git a/kubernetes/main/apps/default/sonarr/app/resources/pushover-notifier.sh b/kubernetes/apps/default/sonarr/app/resources/pushover-notifier.sh similarity index 100% rename from kubernetes/main/apps/default/sonarr/app/resources/pushover-notifier.sh rename to kubernetes/apps/default/sonarr/app/resources/pushover-notifier.sh diff --git a/kubernetes/main/apps/default/sonarr/app/resources/tba-refresher.sh b/kubernetes/apps/default/sonarr/app/resources/tba-refresher.sh similarity index 100% rename from kubernetes/main/apps/default/sonarr/app/resources/tba-refresher.sh rename to kubernetes/apps/default/sonarr/app/resources/tba-refresher.sh diff --git a/kubernetes/main/apps/default/sonarr/ks.yaml b/kubernetes/apps/default/sonarr/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/sonarr/ks.yaml rename to kubernetes/apps/default/sonarr/ks.yaml index 3cddf0347e5c1..f8c191c06b268 100644 --- a/kubernetes/main/apps/default/sonarr/ks.yaml +++ b/kubernetes/apps/default/sonarr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/sonarr/app + path: ./kubernetes/apps/default/sonarr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/tautulli/app/helmrelease.yaml b/kubernetes/apps/default/tautulli/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/tautulli/app/helmrelease.yaml rename to kubernetes/apps/default/tautulli/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/tautulli/app/kustomization.yaml b/kubernetes/apps/default/tautulli/app/kustomization.yaml similarity index 67% rename from kubernetes/main/apps/default/tautulli/app/kustomization.yaml rename to kubernetes/apps/default/tautulli/app/kustomization.yaml index c19505a5e161f..15d58d1026d14 100644 --- a/kubernetes/main/apps/default/tautulli/app/kustomization.yaml +++ b/kubernetes/apps/default/tautulli/app/kustomization.yaml @@ -5,5 +5,5 @@ kind: Kustomization resources: - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/tautulli/app/pvc.yaml b/kubernetes/apps/default/tautulli/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/tautulli/app/pvc.yaml rename to kubernetes/apps/default/tautulli/app/pvc.yaml diff --git a/kubernetes/main/apps/default/tautulli/ks.yaml b/kubernetes/apps/default/tautulli/ks.yaml similarity index 91% rename from kubernetes/main/apps/default/tautulli/ks.yaml rename to kubernetes/apps/default/tautulli/ks.yaml index 648bc4046102b..67c00eeb9ced0 100644 --- a/kubernetes/main/apps/default/tautulli/ks.yaml +++ b/kubernetes/apps/default/tautulli/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: volsync - path: ./kubernetes/main/apps/default/tautulli/app + path: ./kubernetes/apps/default/tautulli/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/unpackerr/app/externalsecret.yaml b/kubernetes/apps/default/unpackerr/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/unpackerr/app/externalsecret.yaml rename to kubernetes/apps/default/unpackerr/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/unpackerr/app/helmrelease.yaml b/kubernetes/apps/default/unpackerr/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/unpackerr/app/helmrelease.yaml rename to kubernetes/apps/default/unpackerr/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/unpackerr/app/kustomization.yaml b/kubernetes/apps/default/unpackerr/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/default/unpackerr/app/kustomization.yaml rename to kubernetes/apps/default/unpackerr/app/kustomization.yaml diff --git a/kubernetes/main/apps/default/unpackerr/ks.yaml b/kubernetes/apps/default/unpackerr/ks.yaml similarity index 90% rename from kubernetes/main/apps/default/unpackerr/ks.yaml rename to kubernetes/apps/default/unpackerr/ks.yaml index f471dce92ac20..ecd9266510241 100644 --- a/kubernetes/main/apps/default/unpackerr/ks.yaml +++ b/kubernetes/apps/default/unpackerr/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/default/unpackerr/app + path: ./kubernetes/apps/default/unpackerr/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/zigbee/app/externalsecret.yaml b/kubernetes/apps/default/zigbee/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/default/zigbee/app/externalsecret.yaml rename to kubernetes/apps/default/zigbee/app/externalsecret.yaml diff --git a/kubernetes/main/apps/default/zigbee/app/helmrelease.yaml b/kubernetes/apps/default/zigbee/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/zigbee/app/helmrelease.yaml rename to kubernetes/apps/default/zigbee/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/zigbee/app/kustomization.yaml b/kubernetes/apps/default/zigbee/app/kustomization.yaml similarity index 81% rename from kubernetes/main/apps/default/zigbee/app/kustomization.yaml rename to kubernetes/apps/default/zigbee/app/kustomization.yaml index d5dea1af4ebe4..3cae2f3f828e4 100644 --- a/kubernetes/main/apps/default/zigbee/app/kustomization.yaml +++ b/kubernetes/apps/default/zigbee/app/kustomization.yaml @@ -5,8 +5,8 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync configMapGenerator: - name: zigbee-loki-rules files: diff --git a/kubernetes/main/apps/default/zigbee/app/resources/lokirule.yaml b/kubernetes/apps/default/zigbee/app/resources/lokirule.yaml similarity index 100% rename from kubernetes/main/apps/default/zigbee/app/resources/lokirule.yaml rename to kubernetes/apps/default/zigbee/app/resources/lokirule.yaml diff --git a/kubernetes/main/apps/default/zigbee/ks.yaml b/kubernetes/apps/default/zigbee/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/zigbee/ks.yaml rename to kubernetes/apps/default/zigbee/ks.yaml index 59724000de359..325c8b64d0d56 100644 --- a/kubernetes/main/apps/default/zigbee/ks.yaml +++ b/kubernetes/apps/default/zigbee/ks.yaml @@ -14,7 +14,7 @@ spec: - name: emqx-cluster - name: external-secrets-stores - name: volsync - path: ./kubernetes/main/apps/default/zigbee/app + path: ./kubernetes/apps/default/zigbee/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/default/zwave/app/helmrelease.yaml b/kubernetes/apps/default/zwave/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/default/zwave/app/helmrelease.yaml rename to kubernetes/apps/default/zwave/app/helmrelease.yaml diff --git a/kubernetes/main/apps/default/zwave/app/kustomization.yaml b/kubernetes/apps/default/zwave/app/kustomization.yaml similarity index 67% rename from kubernetes/main/apps/default/zwave/app/kustomization.yaml rename to kubernetes/apps/default/zwave/app/kustomization.yaml index c19505a5e161f..15d58d1026d14 100644 --- a/kubernetes/main/apps/default/zwave/app/kustomization.yaml +++ b/kubernetes/apps/default/zwave/app/kustomization.yaml @@ -5,5 +5,5 @@ kind: Kustomization resources: - ./pvc.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync + - ../../../../templates/gatus/guarded + - ../../../../templates/volsync diff --git a/kubernetes/main/apps/default/zwave/app/pvc.yaml b/kubernetes/apps/default/zwave/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/default/zwave/app/pvc.yaml rename to kubernetes/apps/default/zwave/app/pvc.yaml diff --git a/kubernetes/main/apps/default/zwave/ks.yaml b/kubernetes/apps/default/zwave/ks.yaml similarity index 92% rename from kubernetes/main/apps/default/zwave/ks.yaml rename to kubernetes/apps/default/zwave/ks.yaml index 41358d29da37b..80d1196946a4b 100644 --- a/kubernetes/main/apps/default/zwave/ks.yaml +++ b/kubernetes/apps/default/zwave/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: volsync - path: ./kubernetes/main/apps/default/zwave/app + path: ./kubernetes/apps/default/zwave/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/external-secrets/external-secrets/app/helmrelease.yaml b/kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/external-secrets/app/helmrelease.yaml rename to kubernetes/apps/external-secrets/external-secrets/app/helmrelease.yaml diff --git a/kubernetes/main/apps/external-secrets/external-secrets/app/kustomization.yaml b/kubernetes/apps/external-secrets/external-secrets/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/external-secrets/app/kustomization.yaml rename to kubernetes/apps/external-secrets/external-secrets/app/kustomization.yaml diff --git a/kubernetes/main/apps/external-secrets/external-secrets/ks.yaml b/kubernetes/apps/external-secrets/external-secrets/ks.yaml similarity index 87% rename from kubernetes/main/apps/external-secrets/external-secrets/ks.yaml rename to kubernetes/apps/external-secrets/external-secrets/ks.yaml index d532365afbb27..dedb6499fd157 100644 --- a/kubernetes/main/apps/external-secrets/external-secrets/ks.yaml +++ b/kubernetes/apps/external-secrets/external-secrets/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/external-secrets/external-secrets/app + path: ./kubernetes/apps/external-secrets/external-secrets/app prune: false # revert to true sourceRef: kind: GitRepository @@ -32,7 +32,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets - path: ./kubernetes/main/apps/external-secrets/external-secrets/stores + path: ./kubernetes/apps/external-secrets/external-secrets/stores prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/external-secrets/external-secrets/stores/clustersecretstore.yaml b/kubernetes/apps/external-secrets/external-secrets/stores/clustersecretstore.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/external-secrets/stores/clustersecretstore.yaml rename to kubernetes/apps/external-secrets/external-secrets/stores/clustersecretstore.yaml diff --git a/kubernetes/main/apps/external-secrets/external-secrets/stores/kustomization.yaml b/kubernetes/apps/external-secrets/external-secrets/stores/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/external-secrets/stores/kustomization.yaml rename to kubernetes/apps/external-secrets/external-secrets/stores/kustomization.yaml diff --git a/kubernetes/main/apps/external-secrets/kustomization.yaml b/kubernetes/apps/external-secrets/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/kustomization.yaml rename to kubernetes/apps/external-secrets/kustomization.yaml diff --git a/kubernetes/main/apps/external-secrets/namespace.yaml b/kubernetes/apps/external-secrets/namespace.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/namespace.yaml rename to kubernetes/apps/external-secrets/namespace.yaml diff --git a/kubernetes/main/apps/external-secrets/onepassword-connect/app/helmrelease.yaml b/kubernetes/apps/external-secrets/onepassword-connect/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/onepassword-connect/app/helmrelease.yaml rename to kubernetes/apps/external-secrets/onepassword-connect/app/helmrelease.yaml diff --git a/kubernetes/main/apps/external-secrets/onepassword-connect/app/kustomization.yaml b/kubernetes/apps/external-secrets/onepassword-connect/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/external-secrets/onepassword-connect/app/kustomization.yaml rename to kubernetes/apps/external-secrets/onepassword-connect/app/kustomization.yaml diff --git a/kubernetes/main/apps/external-secrets/onepassword-connect/ks.yaml b/kubernetes/apps/external-secrets/onepassword-connect/ks.yaml similarity index 87% rename from kubernetes/main/apps/external-secrets/onepassword-connect/ks.yaml rename to kubernetes/apps/external-secrets/onepassword-connect/ks.yaml index db034dbbe65b5..94706321ca22a 100644 --- a/kubernetes/main/apps/external-secrets/onepassword-connect/ks.yaml +++ b/kubernetes/apps/external-secrets/onepassword-connect/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/external-secrets/onepassword-connect/app + path: ./kubernetes/apps/external-secrets/onepassword-connect/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/flux-system/flux-operator/app/helm-values.yaml b/kubernetes/apps/flux-system/flux-operator/app/helm-values.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/app/helm-values.yaml rename to kubernetes/apps/flux-system/flux-operator/app/helm-values.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/app/helmrelease.yaml b/kubernetes/apps/flux-system/flux-operator/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/app/helmrelease.yaml rename to kubernetes/apps/flux-system/flux-operator/app/helmrelease.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/app/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/app/kustomization.yaml rename to kubernetes/apps/flux-system/flux-operator/app/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/app/kustomizeconfig.yaml b/kubernetes/apps/flux-system/flux-operator/app/kustomizeconfig.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/app/kustomizeconfig.yaml rename to kubernetes/apps/flux-system/flux-operator/app/kustomizeconfig.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/kustomization.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/notifications/externalsecret.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/notifications/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/notifications/externalsecret.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/notifications/externalsecret.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/notifications/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/notifications/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/notifications/kustomization.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/notifications/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/notifications/notification.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/notifications/notification.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/notifications/notification.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/notifications/notification.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/externalsecret.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/externalsecret.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/externalsecret.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/ingress.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/ingress.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/ingress.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/ingress.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/kustomization.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/receiver.yaml b/kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/receiver.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/github/webhooks/receiver.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/github/webhooks/receiver.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml b/kubernetes/apps/flux-system/flux-operator/instance/helm-values.yaml similarity index 98% rename from kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/helm-values.yaml index 22b3ef3d6f43d..b7df5207d2c93 100644 --- a/kubernetes/main/apps/flux-system/flux-operator/instance/helm-values.yaml +++ b/kubernetes/apps/flux-system/flux-operator/instance/helm-values.yaml @@ -14,7 +14,7 @@ instance: kind: GitRepository url: ssh://git@github.com/onedr0p/home-ops ref: refs/heads/main - path: kubernetes/main/flux/config + path: kubernetes/flux/cluster pullSecret: github-deploy-key commonMetadata: labels: diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/helmrelease.yaml b/kubernetes/apps/flux-system/flux-operator/instance/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/helmrelease.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/helmrelease.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/kustomization.yaml b/kubernetes/apps/flux-system/flux-operator/instance/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/kustomization.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/kustomizeconfig.yaml b/kubernetes/apps/flux-system/flux-operator/instance/kustomizeconfig.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/kustomizeconfig.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/kustomizeconfig.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/instance/prometheusrule.yaml b/kubernetes/apps/flux-system/flux-operator/instance/prometheusrule.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/flux-operator/instance/prometheusrule.yaml rename to kubernetes/apps/flux-system/flux-operator/instance/prometheusrule.yaml diff --git a/kubernetes/main/apps/flux-system/flux-operator/ks.yaml b/kubernetes/apps/flux-system/flux-operator/ks.yaml similarity index 88% rename from kubernetes/main/apps/flux-system/flux-operator/ks.yaml rename to kubernetes/apps/flux-system/flux-operator/ks.yaml index 3e007701616c6..c60f96e97d982 100644 --- a/kubernetes/main/apps/flux-system/flux-operator/ks.yaml +++ b/kubernetes/apps/flux-system/flux-operator/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/flux-system/flux-operator/app + path: ./kubernetes/apps/flux-system/flux-operator/app prune: false # never should be deleted sourceRef: kind: GitRepository @@ -32,7 +32,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: flux-operator - path: ./kubernetes/main/apps/flux-system/flux-operator/instance + path: ./kubernetes/apps/flux-system/flux-operator/instance prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/flux-system/kustomization.yaml b/kubernetes/apps/flux-system/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/kustomization.yaml rename to kubernetes/apps/flux-system/kustomization.yaml diff --git a/kubernetes/main/apps/flux-system/namespace.yaml b/kubernetes/apps/flux-system/namespace.yaml similarity index 100% rename from kubernetes/main/apps/flux-system/namespace.yaml rename to kubernetes/apps/flux-system/namespace.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/app/helm-values.yaml b/kubernetes/apps/kube-system/cilium/app/helm-values.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/app/helm-values.yaml rename to kubernetes/apps/kube-system/cilium/app/helm-values.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml rename to kubernetes/apps/kube-system/cilium/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/app/kustomization.yaml b/kubernetes/apps/kube-system/cilium/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/app/kustomization.yaml rename to kubernetes/apps/kube-system/cilium/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/app/kustomizeconfig.yaml b/kubernetes/apps/kube-system/cilium/app/kustomizeconfig.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/app/kustomizeconfig.yaml rename to kubernetes/apps/kube-system/cilium/app/kustomizeconfig.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/config/kustomization.yaml b/kubernetes/apps/kube-system/cilium/config/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/config/kustomization.yaml rename to kubernetes/apps/kube-system/cilium/config/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/config/l2.yaml b/kubernetes/apps/kube-system/cilium/config/l2.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/config/l2.yaml rename to kubernetes/apps/kube-system/cilium/config/l2.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/config/l3.yaml b/kubernetes/apps/kube-system/cilium/config/l3.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/config/l3.yaml rename to kubernetes/apps/kube-system/cilium/config/l3.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/config/pool.yaml b/kubernetes/apps/kube-system/cilium/config/pool.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/cilium/config/pool.yaml rename to kubernetes/apps/kube-system/cilium/config/pool.yaml diff --git a/kubernetes/main/apps/kube-system/cilium/ks.yaml b/kubernetes/apps/kube-system/cilium/ks.yaml similarity index 90% rename from kubernetes/main/apps/kube-system/cilium/ks.yaml rename to kubernetes/apps/kube-system/cilium/ks.yaml index 806ea5fd5cadc..a339d634e9c83 100644 --- a/kubernetes/main/apps/kube-system/cilium/ks.yaml +++ b/kubernetes/apps/kube-system/cilium/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/cilium/app + path: ./kubernetes/apps/kube-system/cilium/app prune: false # never should be deleted sourceRef: kind: GitRepository @@ -32,7 +32,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: cilium - path: ./kubernetes/main/apps/kube-system/cilium/config + path: ./kubernetes/apps/kube-system/cilium/config prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/coredns/app/helm-values.yaml b/kubernetes/apps/kube-system/coredns/app/helm-values.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/coredns/app/helm-values.yaml rename to kubernetes/apps/kube-system/coredns/app/helm-values.yaml diff --git a/kubernetes/main/apps/kube-system/coredns/app/helmrelease.yaml b/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/coredns/app/helmrelease.yaml rename to kubernetes/apps/kube-system/coredns/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/coredns/app/kustomization.yaml b/kubernetes/apps/kube-system/coredns/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/coredns/app/kustomization.yaml rename to kubernetes/apps/kube-system/coredns/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/coredns/app/kustomizeconfig.yaml b/kubernetes/apps/kube-system/coredns/app/kustomizeconfig.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/coredns/app/kustomizeconfig.yaml rename to kubernetes/apps/kube-system/coredns/app/kustomizeconfig.yaml diff --git a/kubernetes/main/apps/kube-system/coredns/ks.yaml b/kubernetes/apps/kube-system/coredns/ks.yaml similarity index 89% rename from kubernetes/main/apps/kube-system/coredns/ks.yaml rename to kubernetes/apps/kube-system/coredns/ks.yaml index ea8fbb723f352..f0ca0139abd89 100644 --- a/kubernetes/main/apps/kube-system/coredns/ks.yaml +++ b/kubernetes/apps/kube-system/coredns/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/coredns/app + path: ./kubernetes/apps/kube-system/coredns/app prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/csi-driver-nfs/app/helmrelease.yaml b/kubernetes/apps/kube-system/csi-driver-nfs/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/csi-driver-nfs/app/helmrelease.yaml rename to kubernetes/apps/kube-system/csi-driver-nfs/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/csi-driver-nfs/app/kustomization.yaml b/kubernetes/apps/kube-system/csi-driver-nfs/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/csi-driver-nfs/app/kustomization.yaml rename to kubernetes/apps/kube-system/csi-driver-nfs/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml b/kubernetes/apps/kube-system/csi-driver-nfs/ks.yaml similarity index 88% rename from kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml rename to kubernetes/apps/kube-system/csi-driver-nfs/ks.yaml index 5be42ea2837b7..bf3dd75632dd9 100644 --- a/kubernetes/main/apps/kube-system/csi-driver-nfs/ks.yaml +++ b/kubernetes/apps/kube-system/csi-driver-nfs/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/csi-driver-nfs/app + path: ./kubernetes/apps/kube-system/csi-driver-nfs/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/descheduler/app/helmrelease.yaml b/kubernetes/apps/kube-system/descheduler/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/descheduler/app/helmrelease.yaml rename to kubernetes/apps/kube-system/descheduler/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/descheduler/app/kustomization.yaml b/kubernetes/apps/kube-system/descheduler/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/descheduler/app/kustomization.yaml rename to kubernetes/apps/kube-system/descheduler/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/descheduler/ks.yaml b/kubernetes/apps/kube-system/descheduler/ks.yaml similarity index 89% rename from kubernetes/main/apps/kube-system/descheduler/ks.yaml rename to kubernetes/apps/kube-system/descheduler/ks.yaml index 392770761ae1a..485c89650adf4 100644 --- a/kubernetes/main/apps/kube-system/descheduler/ks.yaml +++ b/kubernetes/apps/kube-system/descheduler/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/descheduler/app + path: ./kubernetes/apps/kube-system/descheduler/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/fstrim/app/helmrelease.yaml b/kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/fstrim/app/helmrelease.yaml rename to kubernetes/apps/kube-system/fstrim/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/fstrim/app/kustomization.yaml b/kubernetes/apps/kube-system/fstrim/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/fstrim/app/kustomization.yaml rename to kubernetes/apps/kube-system/fstrim/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/fstrim/ks.yaml b/kubernetes/apps/kube-system/fstrim/ks.yaml similarity index 89% rename from kubernetes/main/apps/kube-system/fstrim/ks.yaml rename to kubernetes/apps/kube-system/fstrim/ks.yaml index b96ca95c0f3ec..cbfc2722080e5 100644 --- a/kubernetes/main/apps/kube-system/fstrim/ks.yaml +++ b/kubernetes/apps/kube-system/fstrim/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/fstrim/app + path: ./kubernetes/apps/kube-system/fstrim/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/intel-device-plugin/app/helmrelease.yaml b/kubernetes/apps/kube-system/intel-device-plugin/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/intel-device-plugin/app/helmrelease.yaml rename to kubernetes/apps/kube-system/intel-device-plugin/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/intel-device-plugin/app/kustomization.yaml b/kubernetes/apps/kube-system/intel-device-plugin/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/intel-device-plugin/app/kustomization.yaml rename to kubernetes/apps/kube-system/intel-device-plugin/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml b/kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml rename to kubernetes/apps/kube-system/intel-device-plugin/gpu/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml b/kubernetes/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml rename to kubernetes/apps/kube-system/intel-device-plugin/gpu/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/intel-device-plugin/ks.yaml b/kubernetes/apps/kube-system/intel-device-plugin/ks.yaml similarity index 88% rename from kubernetes/main/apps/kube-system/intel-device-plugin/ks.yaml rename to kubernetes/apps/kube-system/intel-device-plugin/ks.yaml index b4cc71c544365..606fdcdea3d26 100644 --- a/kubernetes/main/apps/kube-system/intel-device-plugin/ks.yaml +++ b/kubernetes/apps/kube-system/intel-device-plugin/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/intel-device-plugin/app + path: ./kubernetes/apps/kube-system/intel-device-plugin/app prune: false # revert to true sourceRef: kind: GitRepository @@ -30,7 +30,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/intel-device-plugin/gpu + path: ./kubernetes/apps/kube-system/intel-device-plugin/gpu prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/kustomization.yaml b/kubernetes/apps/kube-system/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/kustomization.yaml rename to kubernetes/apps/kube-system/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/metrics-server/app/helmrelease.yaml b/kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/metrics-server/app/helmrelease.yaml rename to kubernetes/apps/kube-system/metrics-server/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/metrics-server/app/kustomization.yaml b/kubernetes/apps/kube-system/metrics-server/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/metrics-server/app/kustomization.yaml rename to kubernetes/apps/kube-system/metrics-server/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/metrics-server/ks.yaml b/kubernetes/apps/kube-system/metrics-server/ks.yaml similarity index 88% rename from kubernetes/main/apps/kube-system/metrics-server/ks.yaml rename to kubernetes/apps/kube-system/metrics-server/ks.yaml index 20fbd6cfe438f..87811ba663d48 100644 --- a/kubernetes/main/apps/kube-system/metrics-server/ks.yaml +++ b/kubernetes/apps/kube-system/metrics-server/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/metrics-server/app + path: ./kubernetes/apps/kube-system/metrics-server/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/namespace.yaml b/kubernetes/apps/kube-system/namespace.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/namespace.yaml rename to kubernetes/apps/kube-system/namespace.yaml diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/app/helmrelease.yaml b/kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/node-feature-discovery/app/helmrelease.yaml rename to kubernetes/apps/kube-system/node-feature-discovery/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/app/kustomization.yaml b/kubernetes/apps/kube-system/node-feature-discovery/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/node-feature-discovery/app/kustomization.yaml rename to kubernetes/apps/kube-system/node-feature-discovery/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/ks.yaml b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml similarity index 87% rename from kubernetes/main/apps/kube-system/node-feature-discovery/ks.yaml rename to kubernetes/apps/kube-system/node-feature-discovery/ks.yaml index 21d76a504fc28..60ca452fd2b01 100644 --- a/kubernetes/main/apps/kube-system/node-feature-discovery/ks.yaml +++ b/kubernetes/apps/kube-system/node-feature-discovery/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/node-feature-discovery/app + path: ./kubernetes/apps/kube-system/node-feature-discovery/app prune: false # revert to true sourceRef: kind: GitRepository @@ -32,7 +32,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: node-feature-discovery - path: ./kubernetes/main/apps/kube-system/node-feature-discovery/rules + path: ./kubernetes/apps/kube-system/node-feature-discovery/rules prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/intel-gpu-device.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/intel-gpu-device.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/node-feature-discovery/rules/intel-gpu-device.yaml rename to kubernetes/apps/kube-system/node-feature-discovery/rules/intel-gpu-device.yaml diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/kustomization.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/node-feature-discovery/rules/kustomization.yaml rename to kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/nesdr-rtl-sdr-device.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/nesdr-rtl-sdr-device.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/node-feature-discovery/rules/nesdr-rtl-sdr-device.yaml rename to kubernetes/apps/kube-system/node-feature-discovery/rules/nesdr-rtl-sdr-device.yaml diff --git a/kubernetes/main/apps/kube-system/reloader/app/helmrelease.yaml b/kubernetes/apps/kube-system/reloader/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/reloader/app/helmrelease.yaml rename to kubernetes/apps/kube-system/reloader/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/reloader/app/kustomization.yaml b/kubernetes/apps/kube-system/reloader/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/reloader/app/kustomization.yaml rename to kubernetes/apps/kube-system/reloader/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/reloader/ks.yaml b/kubernetes/apps/kube-system/reloader/ks.yaml similarity index 89% rename from kubernetes/main/apps/kube-system/reloader/ks.yaml rename to kubernetes/apps/kube-system/reloader/ks.yaml index a953ca838c6fd..5e83551e46fcc 100644 --- a/kubernetes/main/apps/kube-system/reloader/ks.yaml +++ b/kubernetes/apps/kube-system/reloader/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/reloader/app + path: ./kubernetes/apps/kube-system/reloader/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kube-system/spegel/app/helm-values.yaml b/kubernetes/apps/kube-system/spegel/app/helm-values.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/spegel/app/helm-values.yaml rename to kubernetes/apps/kube-system/spegel/app/helm-values.yaml diff --git a/kubernetes/main/apps/kube-system/spegel/app/helmrelease.yaml b/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/spegel/app/helmrelease.yaml rename to kubernetes/apps/kube-system/spegel/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kube-system/spegel/app/kustomization.yaml b/kubernetes/apps/kube-system/spegel/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/spegel/app/kustomization.yaml rename to kubernetes/apps/kube-system/spegel/app/kustomization.yaml diff --git a/kubernetes/main/apps/kube-system/spegel/app/kustomizeconfig.yaml b/kubernetes/apps/kube-system/spegel/app/kustomizeconfig.yaml similarity index 100% rename from kubernetes/main/apps/kube-system/spegel/app/kustomizeconfig.yaml rename to kubernetes/apps/kube-system/spegel/app/kustomizeconfig.yaml diff --git a/kubernetes/main/apps/kube-system/spegel/ks.yaml b/kubernetes/apps/kube-system/spegel/ks.yaml similarity index 89% rename from kubernetes/main/apps/kube-system/spegel/ks.yaml rename to kubernetes/apps/kube-system/spegel/ks.yaml index eb4145e0dae2e..a9b0b4846926c 100644 --- a/kubernetes/main/apps/kube-system/spegel/ks.yaml +++ b/kubernetes/apps/kube-system/spegel/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kube-system/spegel/app + path: ./kubernetes/apps/kube-system/spegel/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kyverno/kustomization.yaml b/kubernetes/apps/kyverno/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kyverno/kustomization.yaml rename to kubernetes/apps/kyverno/kustomization.yaml diff --git a/kubernetes/main/apps/kyverno/kyverno/app/helmrelease.yaml b/kubernetes/apps/kyverno/kyverno/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/kyverno/kyverno/app/helmrelease.yaml rename to kubernetes/apps/kyverno/kyverno/app/helmrelease.yaml diff --git a/kubernetes/main/apps/kyverno/kyverno/app/kustomization.yaml b/kubernetes/apps/kyverno/kyverno/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kyverno/kyverno/app/kustomization.yaml rename to kubernetes/apps/kyverno/kyverno/app/kustomization.yaml diff --git a/kubernetes/main/apps/kyverno/kyverno/ks.yaml b/kubernetes/apps/kyverno/kyverno/ks.yaml similarity index 90% rename from kubernetes/main/apps/kyverno/kyverno/ks.yaml rename to kubernetes/apps/kyverno/kyverno/ks.yaml index 6006a462d59cf..3522880b6105a 100644 --- a/kubernetes/main/apps/kyverno/kyverno/ks.yaml +++ b/kubernetes/apps/kyverno/kyverno/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/kyverno/kyverno/app + path: ./kubernetes/apps/kyverno/kyverno/app prune: false # revert to true sourceRef: kind: GitRepository @@ -32,7 +32,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: kyverno - path: ./kubernetes/main/apps/kyverno/kyverno/policies + path: ./kubernetes/apps/kyverno/kyverno/policies prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/kyverno/kyverno/policies/kustomization.yaml b/kubernetes/apps/kyverno/kyverno/policies/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/kyverno/kyverno/policies/kustomization.yaml rename to kubernetes/apps/kyverno/kyverno/policies/kustomization.yaml diff --git a/kubernetes/main/apps/kyverno/kyverno/policies/volsync-movers.yaml b/kubernetes/apps/kyverno/kyverno/policies/volsync-movers.yaml similarity index 100% rename from kubernetes/main/apps/kyverno/kyverno/policies/volsync-movers.yaml rename to kubernetes/apps/kyverno/kyverno/policies/volsync-movers.yaml diff --git a/kubernetes/main/apps/kyverno/namespace.yaml b/kubernetes/apps/kyverno/namespace.yaml similarity index 100% rename from kubernetes/main/apps/kyverno/namespace.yaml rename to kubernetes/apps/kyverno/namespace.yaml diff --git a/kubernetes/main/apps/network/cloudflare-ddns/app/externalsecret.yaml b/kubernetes/apps/network/cloudflare-ddns/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflare-ddns/app/externalsecret.yaml rename to kubernetes/apps/network/cloudflare-ddns/app/externalsecret.yaml diff --git a/kubernetes/main/apps/network/cloudflare-ddns/app/helmrelease.yaml b/kubernetes/apps/network/cloudflare-ddns/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflare-ddns/app/helmrelease.yaml rename to kubernetes/apps/network/cloudflare-ddns/app/helmrelease.yaml diff --git a/kubernetes/main/apps/network/cloudflare-ddns/app/kustomization.yaml b/kubernetes/apps/network/cloudflare-ddns/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflare-ddns/app/kustomization.yaml rename to kubernetes/apps/network/cloudflare-ddns/app/kustomization.yaml diff --git a/kubernetes/main/apps/network/cloudflare-ddns/ks.yaml b/kubernetes/apps/network/cloudflare-ddns/ks.yaml similarity index 89% rename from kubernetes/main/apps/network/cloudflare-ddns/ks.yaml rename to kubernetes/apps/network/cloudflare-ddns/ks.yaml index 8e788b7e1f10c..31142fa961b19 100644 --- a/kubernetes/main/apps/network/cloudflare-ddns/ks.yaml +++ b/kubernetes/apps/network/cloudflare-ddns/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/network/cloudflare-ddns/app + path: ./kubernetes/apps/network/cloudflare-ddns/app prune: false sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/cloudflared/app/dnsendpoint.yaml b/kubernetes/apps/network/cloudflared/app/dnsendpoint.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflared/app/dnsendpoint.yaml rename to kubernetes/apps/network/cloudflared/app/dnsendpoint.yaml diff --git a/kubernetes/main/apps/network/cloudflared/app/externalsecret.yaml b/kubernetes/apps/network/cloudflared/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflared/app/externalsecret.yaml rename to kubernetes/apps/network/cloudflared/app/externalsecret.yaml diff --git a/kubernetes/main/apps/network/cloudflared/app/helmrelease.yaml b/kubernetes/apps/network/cloudflared/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflared/app/helmrelease.yaml rename to kubernetes/apps/network/cloudflared/app/helmrelease.yaml diff --git a/kubernetes/main/apps/network/cloudflared/app/kustomization.yaml b/kubernetes/apps/network/cloudflared/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflared/app/kustomization.yaml rename to kubernetes/apps/network/cloudflared/app/kustomization.yaml diff --git a/kubernetes/main/apps/network/cloudflared/app/resources/config.yaml b/kubernetes/apps/network/cloudflared/app/resources/config.yaml similarity index 100% rename from kubernetes/main/apps/network/cloudflared/app/resources/config.yaml rename to kubernetes/apps/network/cloudflared/app/resources/config.yaml diff --git a/kubernetes/main/apps/network/cloudflared/ks.yaml b/kubernetes/apps/network/cloudflared/ks.yaml similarity index 90% rename from kubernetes/main/apps/network/cloudflared/ks.yaml rename to kubernetes/apps/network/cloudflared/ks.yaml index 1cb2e856596a0..188328eb3d15f 100644 --- a/kubernetes/main/apps/network/cloudflared/ks.yaml +++ b/kubernetes/apps/network/cloudflared/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: external-dns-cloudflare - name: external-secrets-stores - path: ./kubernetes/main/apps/network/cloudflared/app + path: ./kubernetes/apps/network/cloudflared/app prune: false sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/apps/network/echo-server/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/echo-server/app/helmrelease.yaml rename to kubernetes/apps/network/echo-server/app/helmrelease.yaml diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml b/kubernetes/apps/network/echo-server/app/kustomization.yaml similarity index 77% rename from kubernetes/main/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml rename to kubernetes/apps/network/echo-server/app/kustomization.yaml index c6642769e3ade..31945e0814329 100644 --- a/kubernetes/main/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml +++ b/kubernetes/apps/network/echo-server/app/kustomization.yaml @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded + - ../../../../templates/gatus/external diff --git a/kubernetes/main/apps/network/echo-server/ks.yaml b/kubernetes/apps/network/echo-server/ks.yaml similarity index 90% rename from kubernetes/main/apps/network/echo-server/ks.yaml rename to kubernetes/apps/network/echo-server/ks.yaml index e71c1003a6d96..b3d6987fce7a3 100644 --- a/kubernetes/main/apps/network/echo-server/ks.yaml +++ b/kubernetes/apps/network/echo-server/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/network/echo-server/app + path: ./kubernetes/apps/network/echo-server/app prune: false sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/external-dns/cloudflare/externalsecret.yaml b/kubernetes/apps/network/external-dns/cloudflare/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/network/external-dns/cloudflare/externalsecret.yaml rename to kubernetes/apps/network/external-dns/cloudflare/externalsecret.yaml diff --git a/kubernetes/main/apps/network/external-dns/cloudflare/helmrelease.yaml b/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/external-dns/cloudflare/helmrelease.yaml rename to kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml diff --git a/kubernetes/main/apps/network/external-dns/cloudflare/kustomization.yaml b/kubernetes/apps/network/external-dns/cloudflare/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/external-dns/cloudflare/kustomization.yaml rename to kubernetes/apps/network/external-dns/cloudflare/kustomization.yaml diff --git a/kubernetes/main/apps/network/external-dns/ks.yaml b/kubernetes/apps/network/external-dns/ks.yaml similarity index 89% rename from kubernetes/main/apps/network/external-dns/ks.yaml rename to kubernetes/apps/network/external-dns/ks.yaml index a846dba7f10a6..a6372cc1dadf4 100644 --- a/kubernetes/main/apps/network/external-dns/ks.yaml +++ b/kubernetes/apps/network/external-dns/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/network/external-dns/cloudflare + path: ./kubernetes/apps/network/external-dns/cloudflare prune: false sourceRef: kind: GitRepository @@ -34,7 +34,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/network/external-dns/unifi + path: ./kubernetes/apps/network/external-dns/unifi prune: false sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/network/external-dns/unifi/externalsecret.yaml b/kubernetes/apps/network/external-dns/unifi/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/network/external-dns/unifi/externalsecret.yaml rename to kubernetes/apps/network/external-dns/unifi/externalsecret.yaml diff --git a/kubernetes/main/apps/network/external-dns/unifi/helmrelease.yaml b/kubernetes/apps/network/external-dns/unifi/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/external-dns/unifi/helmrelease.yaml rename to kubernetes/apps/network/external-dns/unifi/helmrelease.yaml diff --git a/kubernetes/main/apps/network/external-dns/unifi/kustomization.yaml b/kubernetes/apps/network/external-dns/unifi/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/external-dns/unifi/kustomization.yaml rename to kubernetes/apps/network/external-dns/unifi/kustomization.yaml diff --git a/kubernetes/main/apps/network/kustomization.yaml b/kubernetes/apps/network/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/kustomization.yaml rename to kubernetes/apps/network/kustomization.yaml diff --git a/kubernetes/main/apps/network/namespace.yaml b/kubernetes/apps/network/namespace.yaml similarity index 100% rename from kubernetes/main/apps/network/namespace.yaml rename to kubernetes/apps/network/namespace.yaml diff --git a/kubernetes/main/apps/network/nginx/certificates/certificates.yaml b/kubernetes/apps/network/nginx/certificates/certificates.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/certificates/certificates.yaml rename to kubernetes/apps/network/nginx/certificates/certificates.yaml diff --git a/kubernetes/main/apps/network/nginx/certificates/kustomization.yaml b/kubernetes/apps/network/nginx/certificates/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/certificates/kustomization.yaml rename to kubernetes/apps/network/nginx/certificates/kustomization.yaml diff --git a/kubernetes/main/apps/network/nginx/certificates/pushsecret.yaml b/kubernetes/apps/network/nginx/certificates/pushsecret.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/certificates/pushsecret.yaml rename to kubernetes/apps/network/nginx/certificates/pushsecret.yaml diff --git a/kubernetes/main/apps/network/nginx/external/helmrelease.yaml b/kubernetes/apps/network/nginx/external/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/external/helmrelease.yaml rename to kubernetes/apps/network/nginx/external/helmrelease.yaml diff --git a/kubernetes/main/apps/network/nginx/external/kustomization.yaml b/kubernetes/apps/network/nginx/external/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/external/kustomization.yaml rename to kubernetes/apps/network/nginx/external/kustomization.yaml diff --git a/kubernetes/main/apps/network/nginx/internal/helmrelease.yaml b/kubernetes/apps/network/nginx/internal/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/internal/helmrelease.yaml rename to kubernetes/apps/network/nginx/internal/helmrelease.yaml diff --git a/kubernetes/main/apps/network/nginx/internal/kustomization.yaml b/kubernetes/apps/network/nginx/internal/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/network/nginx/internal/kustomization.yaml rename to kubernetes/apps/network/nginx/internal/kustomization.yaml diff --git a/kubernetes/main/apps/network/nginx/ks.yaml b/kubernetes/apps/network/nginx/ks.yaml similarity index 90% rename from kubernetes/main/apps/network/nginx/ks.yaml rename to kubernetes/apps/network/nginx/ks.yaml index cf336bda829b9..208a0041db395 100644 --- a/kubernetes/main/apps/network/nginx/ks.yaml +++ b/kubernetes/apps/network/nginx/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: cert-manager-issuers - name: external-secrets-stores - path: ./kubernetes/main/apps/network/nginx/certificates + path: ./kubernetes/apps/network/nginx/certificates prune: false sourceRef: kind: GitRepository @@ -36,7 +36,7 @@ spec: dependsOn: - name: external-secrets-stores - name: nginx-certificates - path: ./kubernetes/main/apps/network/nginx/external + path: ./kubernetes/apps/network/nginx/external prune: false sourceRef: kind: GitRepository @@ -58,7 +58,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: nginx-certificates - path: ./kubernetes/main/apps/network/nginx/internal + path: ./kubernetes/apps/network/nginx/internal prune: false sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/blackbox-exporter/app/helmrelease.yaml b/kubernetes/apps/observability/blackbox-exporter/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/blackbox-exporter/app/helmrelease.yaml rename to kubernetes/apps/observability/blackbox-exporter/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/blackbox-exporter/app/kustomization.yaml b/kubernetes/apps/observability/blackbox-exporter/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/blackbox-exporter/app/kustomization.yaml rename to kubernetes/apps/observability/blackbox-exporter/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/blackbox-exporter/app/probes.yaml b/kubernetes/apps/observability/blackbox-exporter/app/probes.yaml similarity index 100% rename from kubernetes/main/apps/observability/blackbox-exporter/app/probes.yaml rename to kubernetes/apps/observability/blackbox-exporter/app/probes.yaml diff --git a/kubernetes/main/apps/observability/blackbox-exporter/ks.yaml b/kubernetes/apps/observability/blackbox-exporter/ks.yaml similarity index 88% rename from kubernetes/main/apps/observability/blackbox-exporter/ks.yaml rename to kubernetes/apps/observability/blackbox-exporter/ks.yaml index cd15b0a6237ab..1979e447c18d7 100644 --- a/kubernetes/main/apps/observability/blackbox-exporter/ks.yaml +++ b/kubernetes/apps/observability/blackbox-exporter/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/blackbox-exporter/app + path: ./kubernetes/apps/observability/blackbox-exporter/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/gatus/app/externalsecret.yaml b/kubernetes/apps/observability/gatus/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/observability/gatus/app/externalsecret.yaml rename to kubernetes/apps/observability/gatus/app/externalsecret.yaml diff --git a/kubernetes/main/apps/observability/gatus/app/helmrelease.yaml b/kubernetes/apps/observability/gatus/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/gatus/app/helmrelease.yaml rename to kubernetes/apps/observability/gatus/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/gatus/app/kustomization.yaml b/kubernetes/apps/observability/gatus/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/gatus/app/kustomization.yaml rename to kubernetes/apps/observability/gatus/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/gatus/app/pvc.yaml b/kubernetes/apps/observability/gatus/app/pvc.yaml similarity index 100% rename from kubernetes/main/apps/observability/gatus/app/pvc.yaml rename to kubernetes/apps/observability/gatus/app/pvc.yaml diff --git a/kubernetes/main/apps/observability/gatus/app/rbac.yaml b/kubernetes/apps/observability/gatus/app/rbac.yaml similarity index 100% rename from kubernetes/main/apps/observability/gatus/app/rbac.yaml rename to kubernetes/apps/observability/gatus/app/rbac.yaml diff --git a/kubernetes/main/apps/observability/gatus/app/resources/config.yaml b/kubernetes/apps/observability/gatus/app/resources/config.yaml similarity index 100% rename from kubernetes/main/apps/observability/gatus/app/resources/config.yaml rename to kubernetes/apps/observability/gatus/app/resources/config.yaml diff --git a/kubernetes/main/apps/observability/gatus/ks.yaml b/kubernetes/apps/observability/gatus/ks.yaml similarity index 91% rename from kubernetes/main/apps/observability/gatus/ks.yaml rename to kubernetes/apps/observability/gatus/ks.yaml index 3e0d4c2dc7e7c..ae4466dc9985f 100644 --- a/kubernetes/main/apps/observability/gatus/ks.yaml +++ b/kubernetes/apps/observability/gatus/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/observability/gatus/app + path: ./kubernetes/apps/observability/gatus/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/grafana/app/externalsecret.yaml b/kubernetes/apps/observability/grafana/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/observability/grafana/app/externalsecret.yaml rename to kubernetes/apps/observability/grafana/app/externalsecret.yaml diff --git a/kubernetes/main/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/apps/observability/grafana/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/grafana/app/helmrelease.yaml rename to kubernetes/apps/observability/grafana/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/grafana/app/kustomization.yaml b/kubernetes/apps/observability/grafana/app/kustomization.yaml similarity index 80% rename from kubernetes/main/apps/observability/grafana/app/kustomization.yaml rename to kubernetes/apps/observability/grafana/app/kustomization.yaml index b3a09fd9e83b7..83349e15911b2 100644 --- a/kubernetes/main/apps/observability/grafana/app/kustomization.yaml +++ b/kubernetes/apps/observability/grafana/app/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization resources: - ./externalsecret.yaml - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded + - ../../../../templates/gatus/guarded diff --git a/kubernetes/main/apps/observability/grafana/ks.yaml b/kubernetes/apps/observability/grafana/ks.yaml similarity index 90% rename from kubernetes/main/apps/observability/grafana/ks.yaml rename to kubernetes/apps/observability/grafana/ks.yaml index 09d1df5e2f39f..92d791ee123b3 100644 --- a/kubernetes/main/apps/observability/grafana/ks.yaml +++ b/kubernetes/apps/observability/grafana/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/observability/grafana/app + path: ./kubernetes/apps/observability/grafana/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/kromgo/app/helmrelease.yaml b/kubernetes/apps/observability/kromgo/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/kromgo/app/helmrelease.yaml rename to kubernetes/apps/observability/kromgo/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/kromgo/app/kustomization.yaml b/kubernetes/apps/observability/kromgo/app/kustomization.yaml similarity index 86% rename from kubernetes/main/apps/observability/kromgo/app/kustomization.yaml rename to kubernetes/apps/observability/kromgo/app/kustomization.yaml index 4f93259e9eeab..1d8eabb4a2b39 100644 --- a/kubernetes/main/apps/observability/kromgo/app/kustomization.yaml +++ b/kubernetes/apps/observability/kromgo/app/kustomization.yaml @@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/external + - ../../../../templates/gatus/external configMapGenerator: - name: kromgo-configmap files: diff --git a/kubernetes/main/apps/observability/kromgo/app/resources/config.yaml b/kubernetes/apps/observability/kromgo/app/resources/config.yaml similarity index 100% rename from kubernetes/main/apps/observability/kromgo/app/resources/config.yaml rename to kubernetes/apps/observability/kromgo/app/resources/config.yaml diff --git a/kubernetes/main/apps/observability/kromgo/ks.yaml b/kubernetes/apps/observability/kromgo/ks.yaml similarity index 90% rename from kubernetes/main/apps/observability/kromgo/ks.yaml rename to kubernetes/apps/observability/kromgo/ks.yaml index a8d77591c22cc..d56d86a256d13 100644 --- a/kubernetes/main/apps/observability/kromgo/ks.yaml +++ b/kubernetes/apps/observability/kromgo/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/kromgo/app + path: ./kubernetes/apps/observability/kromgo/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/alertmanagerconfig.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/alertmanagerconfig.yaml similarity index 100% rename from kubernetes/main/apps/observability/kube-prometheus-stack/app/alertmanagerconfig.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/app/alertmanagerconfig.yaml diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/externalsecret.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/observability/kube-prometheus-stack/app/externalsecret.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/app/externalsecret.yaml diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/kustomization.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml similarity index 83% rename from kubernetes/main/apps/observability/kube-prometheus-stack/app/kustomization.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml index b555479428d2f..8b3aaa6b51a22 100644 --- a/kubernetes/main/apps/observability/kube-prometheus-stack/app/kustomization.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml @@ -7,4 +7,4 @@ resources: - ./externalsecret.yaml - ./helmrelease.yaml - ./scrapeconfig.yaml - - ../../../../../shared/templates/gatus/guarded + - ../../../../templates/gatus/guarded diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/scrapeconfig.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/scrapeconfig.yaml similarity index 100% rename from kubernetes/main/apps/observability/kube-prometheus-stack/app/scrapeconfig.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/app/scrapeconfig.yaml diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/crds/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/crds/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/kube-prometheus-stack/crds/helmrelease.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/crds/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/crds/kustomization.yaml b/kubernetes/apps/observability/kube-prometheus-stack/crds/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/kube-prometheus-stack/crds/kustomization.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/crds/kustomization.yaml diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/ks.yaml b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml similarity index 88% rename from kubernetes/main/apps/observability/kube-prometheus-stack/ks.yaml rename to kubernetes/apps/observability/kube-prometheus-stack/ks.yaml index ec90c8af5719b..3927a6eb2cf9e 100644 --- a/kubernetes/main/apps/observability/kube-prometheus-stack/ks.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/observability/kube-prometheus-stack/app + path: ./kubernetes/apps/observability/kube-prometheus-stack/app prune: false # revert to true sourceRef: kind: GitRepository @@ -36,7 +36,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/kube-prometheus-stack/crds + path: ./kubernetes/apps/observability/kube-prometheus-stack/crds prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/kustomization.yaml b/kubernetes/apps/observability/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/kustomization.yaml rename to kubernetes/apps/observability/kustomization.yaml diff --git a/kubernetes/main/apps/observability/loki/app/helmrelease.yaml b/kubernetes/apps/observability/loki/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/loki/app/helmrelease.yaml rename to kubernetes/apps/observability/loki/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/loki/app/kustomization.yaml b/kubernetes/apps/observability/loki/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/loki/app/kustomization.yaml rename to kubernetes/apps/observability/loki/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/loki/ks.yaml b/kubernetes/apps/observability/loki/ks.yaml similarity index 89% rename from kubernetes/main/apps/observability/loki/ks.yaml rename to kubernetes/apps/observability/loki/ks.yaml index a522bba8a21ed..ffb5999f800f1 100644 --- a/kubernetes/main/apps/observability/loki/ks.yaml +++ b/kubernetes/apps/observability/loki/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/loki/app + path: ./kubernetes/apps/observability/loki/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/namespace.yaml b/kubernetes/apps/observability/namespace.yaml similarity index 100% rename from kubernetes/main/apps/observability/namespace.yaml rename to kubernetes/apps/observability/namespace.yaml diff --git a/kubernetes/main/apps/observability/promtail/app/helmrelease.yaml b/kubernetes/apps/observability/promtail/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/promtail/app/helmrelease.yaml rename to kubernetes/apps/observability/promtail/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/promtail/app/kustomization.yaml b/kubernetes/apps/observability/promtail/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/promtail/app/kustomization.yaml rename to kubernetes/apps/observability/promtail/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/promtail/ks.yaml b/kubernetes/apps/observability/promtail/ks.yaml similarity index 89% rename from kubernetes/main/apps/observability/promtail/ks.yaml rename to kubernetes/apps/observability/promtail/ks.yaml index b74a30669b7db..49fd0e81d9ae9 100644 --- a/kubernetes/main/apps/observability/promtail/ks.yaml +++ b/kubernetes/apps/observability/promtail/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/promtail/app + path: ./kubernetes/apps/observability/promtail/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/silence-operator/app/helmrelease.yaml b/kubernetes/apps/observability/silence-operator/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/silence-operator/app/helmrelease.yaml rename to kubernetes/apps/observability/silence-operator/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/silence-operator/app/kustomization.yaml b/kubernetes/apps/observability/silence-operator/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/silence-operator/app/kustomization.yaml rename to kubernetes/apps/observability/silence-operator/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/silence-operator/crds/helmrelease.yaml b/kubernetes/apps/observability/silence-operator/crds/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/silence-operator/crds/helmrelease.yaml rename to kubernetes/apps/observability/silence-operator/crds/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/silence-operator/crds/kustomization.yaml b/kubernetes/apps/observability/silence-operator/crds/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/silence-operator/crds/kustomization.yaml rename to kubernetes/apps/observability/silence-operator/crds/kustomization.yaml diff --git a/kubernetes/main/apps/observability/silence-operator/ks.yaml b/kubernetes/apps/observability/silence-operator/ks.yaml similarity index 88% rename from kubernetes/main/apps/observability/silence-operator/ks.yaml rename to kubernetes/apps/observability/silence-operator/ks.yaml index 71ce7c556eed5..a5f0e9d9b027b 100644 --- a/kubernetes/main/apps/observability/silence-operator/ks.yaml +++ b/kubernetes/apps/observability/silence-operator/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/silence-operator/app + path: ./kubernetes/apps/observability/silence-operator/app prune: false # revert to true sourceRef: kind: GitRepository @@ -30,7 +30,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/silence-operator/crds + path: ./kubernetes/apps/observability/silence-operator/crds prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/smartctl-exporter/app/helmrelease.yaml b/kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/smartctl-exporter/app/helmrelease.yaml rename to kubernetes/apps/observability/smartctl-exporter/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/smartctl-exporter/app/kustomization.yaml b/kubernetes/apps/observability/smartctl-exporter/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/smartctl-exporter/app/kustomization.yaml rename to kubernetes/apps/observability/smartctl-exporter/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/smartctl-exporter/app/prometheusrule.yaml b/kubernetes/apps/observability/smartctl-exporter/app/prometheusrule.yaml similarity index 100% rename from kubernetes/main/apps/observability/smartctl-exporter/app/prometheusrule.yaml rename to kubernetes/apps/observability/smartctl-exporter/app/prometheusrule.yaml diff --git a/kubernetes/main/apps/observability/smartctl-exporter/ks.yaml b/kubernetes/apps/observability/smartctl-exporter/ks.yaml similarity index 87% rename from kubernetes/main/apps/observability/smartctl-exporter/ks.yaml rename to kubernetes/apps/observability/smartctl-exporter/ks.yaml index 3156384124c84..e10e1a8306a02 100644 --- a/kubernetes/main/apps/observability/smartctl-exporter/ks.yaml +++ b/kubernetes/apps/observability/smartctl-exporter/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/smartctl-exporter/app + path: ./kubernetes/apps/observability/smartctl-exporter/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/snmp-exporter/app/helmrelease.yaml b/kubernetes/apps/observability/snmp-exporter/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/snmp-exporter/app/helmrelease.yaml rename to kubernetes/apps/observability/snmp-exporter/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/snmp-exporter/app/kustomization.yaml b/kubernetes/apps/observability/snmp-exporter/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/snmp-exporter/app/kustomization.yaml rename to kubernetes/apps/observability/snmp-exporter/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/snmp-exporter/app/prometheusrule.yaml b/kubernetes/apps/observability/snmp-exporter/app/prometheusrule.yaml similarity index 100% rename from kubernetes/main/apps/observability/snmp-exporter/app/prometheusrule.yaml rename to kubernetes/apps/observability/snmp-exporter/app/prometheusrule.yaml diff --git a/kubernetes/main/apps/observability/snmp-exporter/ks.yaml b/kubernetes/apps/observability/snmp-exporter/ks.yaml similarity index 88% rename from kubernetes/main/apps/observability/snmp-exporter/ks.yaml rename to kubernetes/apps/observability/snmp-exporter/ks.yaml index 8d0bd4657cd29..f2e45a541e854 100644 --- a/kubernetes/main/apps/observability/snmp-exporter/ks.yaml +++ b/kubernetes/apps/observability/snmp-exporter/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/observability/snmp-exporter/app + path: ./kubernetes/apps/observability/snmp-exporter/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/observability/unpoller/app/externalsecret.yaml b/kubernetes/apps/observability/unpoller/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/observability/unpoller/app/externalsecret.yaml rename to kubernetes/apps/observability/unpoller/app/externalsecret.yaml diff --git a/kubernetes/main/apps/observability/unpoller/app/helmrelease.yaml b/kubernetes/apps/observability/unpoller/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/observability/unpoller/app/helmrelease.yaml rename to kubernetes/apps/observability/unpoller/app/helmrelease.yaml diff --git a/kubernetes/main/apps/observability/unpoller/app/kustomization.yaml b/kubernetes/apps/observability/unpoller/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/observability/unpoller/app/kustomization.yaml rename to kubernetes/apps/observability/unpoller/app/kustomization.yaml diff --git a/kubernetes/main/apps/observability/unpoller/ks.yaml b/kubernetes/apps/observability/unpoller/ks.yaml similarity index 90% rename from kubernetes/main/apps/observability/unpoller/ks.yaml rename to kubernetes/apps/observability/unpoller/ks.yaml index fe0a49807648c..34832dcdbc8c7 100644 --- a/kubernetes/main/apps/observability/unpoller/ks.yaml +++ b/kubernetes/apps/observability/unpoller/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/observability/unpoller/app + path: ./kubernetes/apps/observability/unpoller/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/openebs-system/kustomization.yaml b/kubernetes/apps/openebs-system/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/openebs-system/kustomization.yaml rename to kubernetes/apps/openebs-system/kustomization.yaml diff --git a/kubernetes/main/apps/openebs-system/namespace.yaml b/kubernetes/apps/openebs-system/namespace.yaml similarity index 100% rename from kubernetes/main/apps/openebs-system/namespace.yaml rename to kubernetes/apps/openebs-system/namespace.yaml diff --git a/kubernetes/main/apps/openebs-system/openebs/app/helmrelease.yaml b/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/openebs-system/openebs/app/helmrelease.yaml rename to kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml diff --git a/kubernetes/main/apps/openebs-system/openebs/app/kustomization.yaml b/kubernetes/apps/openebs-system/openebs/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/openebs-system/openebs/app/kustomization.yaml rename to kubernetes/apps/openebs-system/openebs/app/kustomization.yaml diff --git a/kubernetes/main/apps/openebs-system/openebs/ks.yaml b/kubernetes/apps/openebs-system/openebs/ks.yaml similarity index 89% rename from kubernetes/main/apps/openebs-system/openebs/ks.yaml rename to kubernetes/apps/openebs-system/openebs/ks.yaml index 5204feb3f34cc..ad46d1ae6f709 100644 --- a/kubernetes/main/apps/openebs-system/openebs/ks.yaml +++ b/kubernetes/apps/openebs-system/openebs/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/openebs-system/openebs/app + path: ./kubernetes/apps/openebs-system/openebs/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/rook-ceph/kustomization.yaml b/kubernetes/apps/rook-ceph/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/rook-ceph/kustomization.yaml rename to kubernetes/apps/rook-ceph/kustomization.yaml diff --git a/kubernetes/main/apps/rook-ceph/namespace.yaml b/kubernetes/apps/rook-ceph/namespace.yaml similarity index 100% rename from kubernetes/main/apps/rook-ceph/namespace.yaml rename to kubernetes/apps/rook-ceph/namespace.yaml diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/app/externalsecret.yaml b/kubernetes/apps/rook-ceph/rook-ceph/app/externalsecret.yaml similarity index 100% rename from kubernetes/main/apps/rook-ceph/rook-ceph/app/externalsecret.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/app/externalsecret.yaml diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/app/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/rook-ceph/rook-ceph/app/helmrelease.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/app/helmrelease.yaml diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/app/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/rook-ceph/rook-ceph/app/kustomization.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/app/kustomization.yaml diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml diff --git a/kubernetes/main/apps/network/echo-server/app/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml similarity index 77% rename from kubernetes/main/apps/network/echo-server/app/kustomization.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml index 1de673a4dfe63..ca013c8817afa 100644 --- a/kubernetes/main/apps/network/echo-server/app/kustomization.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml @@ -4,4 +4,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/external + - ../../../../templates/gatus/guarded diff --git a/kubernetes/main/apps/rook-ceph/rook-ceph/ks.yaml b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml similarity index 91% rename from kubernetes/main/apps/rook-ceph/rook-ceph/ks.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/ks.yaml index c295c660aca08..bf855e6d34741 100644 --- a/kubernetes/main/apps/rook-ceph/rook-ceph/ks.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/rook-ceph/rook-ceph/app + path: ./kubernetes/apps/rook-ceph/rook-ceph/app prune: false # never should be deleted sourceRef: kind: GitRepository @@ -34,7 +34,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - path: ./kubernetes/main/apps/rook-ceph/rook-ceph/cluster + path: ./kubernetes/apps/rook-ceph/rook-ceph/cluster prune: false # never should be deleted sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/volsync-system/kustomization.yaml b/kubernetes/apps/volsync-system/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/kustomization.yaml rename to kubernetes/apps/volsync-system/kustomization.yaml diff --git a/kubernetes/main/apps/volsync-system/namespace.yaml b/kubernetes/apps/volsync-system/namespace.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/namespace.yaml rename to kubernetes/apps/volsync-system/namespace.yaml diff --git a/kubernetes/main/apps/volsync-system/snapshot-controller/app/helmrelease.yaml b/kubernetes/apps/volsync-system/snapshot-controller/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/snapshot-controller/app/helmrelease.yaml rename to kubernetes/apps/volsync-system/snapshot-controller/app/helmrelease.yaml diff --git a/kubernetes/main/apps/volsync-system/snapshot-controller/app/kustomization.yaml b/kubernetes/apps/volsync-system/snapshot-controller/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/snapshot-controller/app/kustomization.yaml rename to kubernetes/apps/volsync-system/snapshot-controller/app/kustomization.yaml diff --git a/kubernetes/main/apps/volsync-system/snapshot-controller/ks.yaml b/kubernetes/apps/volsync-system/snapshot-controller/ks.yaml similarity index 87% rename from kubernetes/main/apps/volsync-system/snapshot-controller/ks.yaml rename to kubernetes/apps/volsync-system/snapshot-controller/ks.yaml index 3ee916afc7737..11c3a18436c66 100644 --- a/kubernetes/main/apps/volsync-system/snapshot-controller/ks.yaml +++ b/kubernetes/apps/volsync-system/snapshot-controller/ks.yaml @@ -10,7 +10,7 @@ spec: commonMetadata: labels: app.kubernetes.io/name: *app - path: ./kubernetes/main/apps/volsync-system/snapshot-controller/app + path: ./kubernetes/apps/volsync-system/snapshot-controller/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/apps/volsync-system/volsync/app/helmrelease.yaml b/kubernetes/apps/volsync-system/volsync/app/helmrelease.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/volsync/app/helmrelease.yaml rename to kubernetes/apps/volsync-system/volsync/app/helmrelease.yaml diff --git a/kubernetes/main/apps/volsync-system/volsync/app/kustomization.yaml b/kubernetes/apps/volsync-system/volsync/app/kustomization.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/volsync/app/kustomization.yaml rename to kubernetes/apps/volsync-system/volsync/app/kustomization.yaml diff --git a/kubernetes/main/apps/volsync-system/volsync/app/prometheusrule.yaml b/kubernetes/apps/volsync-system/volsync/app/prometheusrule.yaml similarity index 100% rename from kubernetes/main/apps/volsync-system/volsync/app/prometheusrule.yaml rename to kubernetes/apps/volsync-system/volsync/app/prometheusrule.yaml diff --git a/kubernetes/main/apps/volsync-system/volsync/ks.yaml b/kubernetes/apps/volsync-system/volsync/ks.yaml similarity index 90% rename from kubernetes/main/apps/volsync-system/volsync/ks.yaml rename to kubernetes/apps/volsync-system/volsync/ks.yaml index 6eea77a827590..16c07f1b4dc29 100644 --- a/kubernetes/main/apps/volsync-system/volsync/ks.yaml +++ b/kubernetes/apps/volsync-system/volsync/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: kyverno-policies - path: ./kubernetes/main/apps/volsync-system/volsync/app + path: ./kubernetes/apps/volsync-system/volsync/app prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/main/cluster.env b/kubernetes/bootstrap/.cluster.env similarity index 100% rename from kubernetes/main/cluster.env rename to kubernetes/bootstrap/.cluster.env diff --git a/kubernetes/bootstrap/.sourceignore b/kubernetes/bootstrap/.sourceignore new file mode 100644 index 0000000000000..72e8ffc0db8aa --- /dev/null +++ b/kubernetes/bootstrap/.sourceignore @@ -0,0 +1 @@ +* diff --git a/kubernetes/main/bootstrap/bootstrap.env b/kubernetes/bootstrap/apps/.secrets.env similarity index 100% rename from kubernetes/main/bootstrap/bootstrap.env rename to kubernetes/bootstrap/apps/.secrets.env diff --git a/kubernetes/main/bootstrap/helmfile.yaml b/kubernetes/bootstrap/apps/helmfile.yaml similarity index 100% rename from kubernetes/main/bootstrap/helmfile.yaml rename to kubernetes/bootstrap/apps/helmfile.yaml diff --git a/kubernetes/main/bootstrap/templates/resources.yaml.j2 b/kubernetes/bootstrap/apps/templates/resources.yaml.j2 similarity index 100% rename from kubernetes/main/bootstrap/templates/resources.yaml.j2 rename to kubernetes/bootstrap/apps/templates/resources.yaml.j2 diff --git a/kubernetes/main/bootstrap/templates/wipe-rook.yaml.gotmpl b/kubernetes/bootstrap/apps/templates/wipe-rook.yaml.gotmpl similarity index 100% rename from kubernetes/main/bootstrap/templates/wipe-rook.yaml.gotmpl rename to kubernetes/bootstrap/apps/templates/wipe-rook.yaml.gotmpl diff --git a/kubernetes/main/talos/192.168.42.10.sops.yaml.j2 b/kubernetes/bootstrap/talos/192.168.42.10.sops.yaml.j2 similarity index 100% rename from kubernetes/main/talos/192.168.42.10.sops.yaml.j2 rename to kubernetes/bootstrap/talos/192.168.42.10.sops.yaml.j2 diff --git a/kubernetes/main/talos/192.168.42.11.sops.yaml.j2 b/kubernetes/bootstrap/talos/192.168.42.11.sops.yaml.j2 similarity index 100% rename from kubernetes/main/talos/192.168.42.11.sops.yaml.j2 rename to kubernetes/bootstrap/talos/192.168.42.11.sops.yaml.j2 diff --git a/kubernetes/main/talos/192.168.42.12.sops.yaml.j2 b/kubernetes/bootstrap/talos/192.168.42.12.sops.yaml.j2 similarity index 100% rename from kubernetes/main/talos/192.168.42.12.sops.yaml.j2 rename to kubernetes/bootstrap/talos/192.168.42.12.sops.yaml.j2 diff --git a/kubernetes/main/flux/config/cluster.yaml b/kubernetes/flux/cluster/ks.yaml similarity index 73% rename from kubernetes/main/flux/config/cluster.yaml rename to kubernetes/flux/cluster/ks.yaml index f76d6b3607533..97aee1082c522 100644 --- a/kubernetes/main/flux/config/cluster.yaml +++ b/kubernetes/flux/cluster/ks.yaml @@ -3,30 +3,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: cluster-shared + name: cluster-meta namespace: flux-system spec: interval: 30m - path: ./kubernetes/shared - prune: false # revert to true - wait: true - sourceRef: - kind: GitRepository - name: flux-system - decryption: - provider: sops - secretRef: - name: sops-age ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: cluster-settings - namespace: flux-system -spec: - interval: 30m - path: ./kubernetes/main/flux/settings + path: ./kubernetes/flux/meta prune: false # revert to true wait: true sourceRef: @@ -46,9 +27,8 @@ metadata: spec: interval: 30m dependsOn: - - name: cluster-shared - - name: cluster-settings - path: ./kubernetes/main/apps + - name: cluster-meta + path: ./kubernetes/apps prune: false # revert to true sourceRef: kind: GitRepository diff --git a/kubernetes/shared/templates/kustomization.yaml b/kubernetes/flux/meta/kustomization.yaml similarity index 78% rename from kubernetes/shared/templates/kustomization.yaml rename to kubernetes/flux/meta/kustomization.yaml index 9a9b327efc48c..e72a3a33cec08 100644 --- a/kubernetes/shared/templates/kustomization.yaml +++ b/kubernetes/flux/meta/kustomization.yaml @@ -3,4 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: flux-system -resources: [] +resources: + - ./repositories + - ./settings diff --git a/kubernetes/main/flux/settings/kustomization.yaml b/kubernetes/flux/meta/repositories/git/kustomization.yaml similarity index 100% rename from kubernetes/main/flux/settings/kustomization.yaml rename to kubernetes/flux/meta/repositories/git/kustomization.yaml diff --git a/kubernetes/shared/repos/helm/actions-runner-controller.yaml b/kubernetes/flux/meta/repositories/helm/actions-runner-controller.yaml similarity index 100% rename from kubernetes/shared/repos/helm/actions-runner-controller.yaml rename to kubernetes/flux/meta/repositories/helm/actions-runner-controller.yaml diff --git a/kubernetes/shared/repos/helm/backube.yaml b/kubernetes/flux/meta/repositories/helm/backube.yaml similarity index 100% rename from kubernetes/shared/repos/helm/backube.yaml rename to kubernetes/flux/meta/repositories/helm/backube.yaml diff --git a/kubernetes/shared/repos/helm/bitnami.yaml b/kubernetes/flux/meta/repositories/helm/bitnami.yaml similarity index 100% rename from kubernetes/shared/repos/helm/bitnami.yaml rename to kubernetes/flux/meta/repositories/helm/bitnami.yaml diff --git a/kubernetes/shared/repos/helm/bjw-s.yaml b/kubernetes/flux/meta/repositories/helm/bjw-s.yaml similarity index 100% rename from kubernetes/shared/repos/helm/bjw-s.yaml rename to kubernetes/flux/meta/repositories/helm/bjw-s.yaml diff --git a/kubernetes/shared/repos/helm/cilium.yaml b/kubernetes/flux/meta/repositories/helm/cilium.yaml similarity index 100% rename from kubernetes/shared/repos/helm/cilium.yaml rename to kubernetes/flux/meta/repositories/helm/cilium.yaml diff --git a/kubernetes/shared/repos/helm/cloudnative-pg.yaml b/kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml similarity index 100% rename from kubernetes/shared/repos/helm/cloudnative-pg.yaml rename to kubernetes/flux/meta/repositories/helm/cloudnative-pg.yaml diff --git a/kubernetes/shared/repos/helm/controlplaneio.yaml b/kubernetes/flux/meta/repositories/helm/controlplaneio.yaml similarity index 100% rename from kubernetes/shared/repos/helm/controlplaneio.yaml rename to kubernetes/flux/meta/repositories/helm/controlplaneio.yaml diff --git a/kubernetes/shared/repos/helm/coredns.yaml b/kubernetes/flux/meta/repositories/helm/coredns.yaml similarity index 100% rename from kubernetes/shared/repos/helm/coredns.yaml rename to kubernetes/flux/meta/repositories/helm/coredns.yaml diff --git a/kubernetes/shared/repos/helm/crossplane.yaml b/kubernetes/flux/meta/repositories/helm/crossplane.yaml similarity index 100% rename from kubernetes/shared/repos/helm/crossplane.yaml rename to kubernetes/flux/meta/repositories/helm/crossplane.yaml diff --git a/kubernetes/shared/repos/helm/crunchydata.yaml b/kubernetes/flux/meta/repositories/helm/crunchydata.yaml similarity index 100% rename from kubernetes/shared/repos/helm/crunchydata.yaml rename to kubernetes/flux/meta/repositories/helm/crunchydata.yaml diff --git a/kubernetes/shared/repos/helm/csi-driver-nfs.yaml b/kubernetes/flux/meta/repositories/helm/csi-driver-nfs.yaml similarity index 100% rename from kubernetes/shared/repos/helm/csi-driver-nfs.yaml rename to kubernetes/flux/meta/repositories/helm/csi-driver-nfs.yaml diff --git a/kubernetes/shared/repos/helm/descheduler.yaml b/kubernetes/flux/meta/repositories/helm/descheduler.yaml similarity index 100% rename from kubernetes/shared/repos/helm/descheduler.yaml rename to kubernetes/flux/meta/repositories/helm/descheduler.yaml diff --git a/kubernetes/shared/repos/helm/emqx.yaml b/kubernetes/flux/meta/repositories/helm/emqx.yaml similarity index 100% rename from kubernetes/shared/repos/helm/emqx.yaml rename to kubernetes/flux/meta/repositories/helm/emqx.yaml diff --git a/kubernetes/shared/repos/helm/external-dns.yaml b/kubernetes/flux/meta/repositories/helm/external-dns.yaml similarity index 100% rename from kubernetes/shared/repos/helm/external-dns.yaml rename to kubernetes/flux/meta/repositories/helm/external-dns.yaml diff --git a/kubernetes/shared/repos/helm/external-secrets.yaml b/kubernetes/flux/meta/repositories/helm/external-secrets.yaml similarity index 100% rename from kubernetes/shared/repos/helm/external-secrets.yaml rename to kubernetes/flux/meta/repositories/helm/external-secrets.yaml diff --git a/kubernetes/shared/repos/helm/fluxcd-community.yaml b/kubernetes/flux/meta/repositories/helm/fluxcd-community.yaml similarity index 100% rename from kubernetes/shared/repos/helm/fluxcd-community.yaml rename to kubernetes/flux/meta/repositories/helm/fluxcd-community.yaml diff --git a/kubernetes/shared/repos/helm/grafana.yaml b/kubernetes/flux/meta/repositories/helm/grafana.yaml similarity index 100% rename from kubernetes/shared/repos/helm/grafana.yaml rename to kubernetes/flux/meta/repositories/helm/grafana.yaml diff --git a/kubernetes/shared/repos/helm/ingress-nginx.yaml b/kubernetes/flux/meta/repositories/helm/ingress-nginx.yaml similarity index 100% rename from kubernetes/shared/repos/helm/ingress-nginx.yaml rename to kubernetes/flux/meta/repositories/helm/ingress-nginx.yaml diff --git a/kubernetes/shared/repos/helm/intel.yaml b/kubernetes/flux/meta/repositories/helm/intel.yaml similarity index 100% rename from kubernetes/shared/repos/helm/intel.yaml rename to kubernetes/flux/meta/repositories/helm/intel.yaml diff --git a/kubernetes/shared/repos/helm/jetstack.yaml b/kubernetes/flux/meta/repositories/helm/jetstack.yaml similarity index 100% rename from kubernetes/shared/repos/helm/jetstack.yaml rename to kubernetes/flux/meta/repositories/helm/jetstack.yaml diff --git a/kubernetes/shared/repos/helm/kustomization.yaml b/kubernetes/flux/meta/repositories/helm/kustomization.yaml similarity index 100% rename from kubernetes/shared/repos/helm/kustomization.yaml rename to kubernetes/flux/meta/repositories/helm/kustomization.yaml diff --git a/kubernetes/shared/repos/helm/kyverno.yaml b/kubernetes/flux/meta/repositories/helm/kyverno.yaml similarity index 100% rename from kubernetes/shared/repos/helm/kyverno.yaml rename to kubernetes/flux/meta/repositories/helm/kyverno.yaml diff --git a/kubernetes/shared/repos/helm/metrics-server.yaml b/kubernetes/flux/meta/repositories/helm/metrics-server.yaml similarity index 100% rename from kubernetes/shared/repos/helm/metrics-server.yaml rename to kubernetes/flux/meta/repositories/helm/metrics-server.yaml diff --git a/kubernetes/shared/repos/helm/node-feature-discovery.yaml b/kubernetes/flux/meta/repositories/helm/node-feature-discovery.yaml similarity index 100% rename from kubernetes/shared/repos/helm/node-feature-discovery.yaml rename to kubernetes/flux/meta/repositories/helm/node-feature-discovery.yaml diff --git a/kubernetes/shared/repos/helm/openebs.yaml b/kubernetes/flux/meta/repositories/helm/openebs.yaml similarity index 100% rename from kubernetes/shared/repos/helm/openebs.yaml rename to kubernetes/flux/meta/repositories/helm/openebs.yaml diff --git a/kubernetes/shared/repos/helm/piraeus.yaml b/kubernetes/flux/meta/repositories/helm/piraeus.yaml similarity index 100% rename from kubernetes/shared/repos/helm/piraeus.yaml rename to kubernetes/flux/meta/repositories/helm/piraeus.yaml diff --git a/kubernetes/shared/repos/helm/prometheus-community.yaml b/kubernetes/flux/meta/repositories/helm/prometheus-community.yaml similarity index 100% rename from kubernetes/shared/repos/helm/prometheus-community.yaml rename to kubernetes/flux/meta/repositories/helm/prometheus-community.yaml diff --git a/kubernetes/shared/repos/helm/rook-ceph.yaml b/kubernetes/flux/meta/repositories/helm/rook-ceph.yaml similarity index 100% rename from kubernetes/shared/repos/helm/rook-ceph.yaml rename to kubernetes/flux/meta/repositories/helm/rook-ceph.yaml diff --git a/kubernetes/shared/repos/helm/spegel.yaml b/kubernetes/flux/meta/repositories/helm/spegel.yaml similarity index 100% rename from kubernetes/shared/repos/helm/spegel.yaml rename to kubernetes/flux/meta/repositories/helm/spegel.yaml diff --git a/kubernetes/shared/repos/helm/stakater.yaml b/kubernetes/flux/meta/repositories/helm/stakater.yaml similarity index 100% rename from kubernetes/shared/repos/helm/stakater.yaml rename to kubernetes/flux/meta/repositories/helm/stakater.yaml diff --git a/kubernetes/shared/repos/helm/stevehipwell.yaml b/kubernetes/flux/meta/repositories/helm/stevehipwell.yaml similarity index 100% rename from kubernetes/shared/repos/helm/stevehipwell.yaml rename to kubernetes/flux/meta/repositories/helm/stevehipwell.yaml diff --git a/kubernetes/shared/repos/helm/wiremind.yaml b/kubernetes/flux/meta/repositories/helm/wiremind.yaml similarity index 100% rename from kubernetes/shared/repos/helm/wiremind.yaml rename to kubernetes/flux/meta/repositories/helm/wiremind.yaml diff --git a/kubernetes/shared/repos/kustomization.yaml b/kubernetes/flux/meta/repositories/kustomization.yaml similarity index 100% rename from kubernetes/shared/repos/kustomization.yaml rename to kubernetes/flux/meta/repositories/kustomization.yaml diff --git a/kubernetes/shared/repos/git/kustomization.yaml b/kubernetes/flux/meta/repositories/oci/kustomization.yaml similarity index 100% rename from kubernetes/shared/repos/git/kustomization.yaml rename to kubernetes/flux/meta/repositories/oci/kustomization.yaml diff --git a/kubernetes/shared/repos/oci/kustomization.yaml b/kubernetes/flux/meta/settings/kustomization.yaml similarity index 100% rename from kubernetes/shared/repos/oci/kustomization.yaml rename to kubernetes/flux/meta/settings/kustomization.yaml diff --git a/kubernetes/main/apps/default/atuin/app/kustomization.yaml b/kubernetes/main/apps/default/atuin/app/kustomization.yaml deleted file mode 100644 index eff822ae3e408..0000000000000 --- a/kubernetes/main/apps/default/atuin/app/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# yaml-language-server: $schema=https://json.schemastore.org/kustomization -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ./helmrelease.yaml - - ../../../../../shared/templates/gatus/guarded - - ../../../../../shared/templates/volsync diff --git a/kubernetes/shared/templates/gatus/external/configmap.yaml b/kubernetes/templates/gatus/external/configmap.yaml similarity index 100% rename from kubernetes/shared/templates/gatus/external/configmap.yaml rename to kubernetes/templates/gatus/external/configmap.yaml diff --git a/kubernetes/shared/templates/gatus/external/kustomization.yaml b/kubernetes/templates/gatus/external/kustomization.yaml similarity index 100% rename from kubernetes/shared/templates/gatus/external/kustomization.yaml rename to kubernetes/templates/gatus/external/kustomization.yaml diff --git a/kubernetes/shared/templates/gatus/guarded/configmap.yaml b/kubernetes/templates/gatus/guarded/configmap.yaml similarity index 100% rename from kubernetes/shared/templates/gatus/guarded/configmap.yaml rename to kubernetes/templates/gatus/guarded/configmap.yaml diff --git a/kubernetes/shared/templates/gatus/guarded/kustomization.yaml b/kubernetes/templates/gatus/guarded/kustomization.yaml similarity index 100% rename from kubernetes/shared/templates/gatus/guarded/kustomization.yaml rename to kubernetes/templates/gatus/guarded/kustomization.yaml diff --git a/kubernetes/shared/settings/kustomization.yaml b/kubernetes/templates/kustomization.yaml similarity index 100% rename from kubernetes/shared/settings/kustomization.yaml rename to kubernetes/templates/kustomization.yaml diff --git a/kubernetes/shared/templates/volsync/claim.yaml b/kubernetes/templates/volsync/claim.yaml similarity index 100% rename from kubernetes/shared/templates/volsync/claim.yaml rename to kubernetes/templates/volsync/claim.yaml diff --git a/kubernetes/shared/templates/volsync/kustomization.yaml b/kubernetes/templates/volsync/kustomization.yaml similarity index 100% rename from kubernetes/shared/templates/volsync/kustomization.yaml rename to kubernetes/templates/volsync/kustomization.yaml diff --git a/kubernetes/shared/templates/volsync/nfs.yaml b/kubernetes/templates/volsync/nfs.yaml similarity index 100% rename from kubernetes/shared/templates/volsync/nfs.yaml rename to kubernetes/templates/volsync/nfs.yaml diff --git a/kubernetes/shared/templates/volsync/r2.yaml b/kubernetes/templates/volsync/r2.yaml similarity index 100% rename from kubernetes/shared/templates/volsync/r2.yaml rename to kubernetes/templates/volsync/r2.yaml