From b72b7a8ca241ad09cd5d58b70f8416b3539d6acb Mon Sep 17 00:00:00 2001 From: Maarten Date: Tue, 3 Mar 2026 18:38:46 +0100 Subject: [PATCH] Restructure: move scripts to bin/, configs to envs/, hetzner setup to envs/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pure file moves (no content changes) for clean git rename detection. - incusos/*.sh scripts → bin/ - incusos/helpers/ → bin/helpers/ - incusos/awx-manifests/, observability-dashboards/ → bin/data/ - incusos/examples/ → bin/examples/ - incusos/observe-deploy, investigate-*, test-boot-reliability → bin/diagnostic/ - incusos/targets/beelink/ → envs/beelink/ - incusos/targets/hetzner/ → envs/hetzner/ - hetzner/ → envs/hetzner/setup/ Co-Authored-By: Claude Opus 4.6 --- {incusos => bin}/README.md | 0 {incusos => bin}/TESTING.md | 0 {incusos => bin/data}/awx-manifests/base/awx.yaml | 0 .../data}/awx-manifests/base/kustomization.yaml | 0 .../data}/awx-manifests/operator/kustomization.yaml | 0 .../observability-dashboards/community/.gitkeep | 0 .../core/capacity-planning.json | 0 .../core/cluster-overview.json | 0 .../core/haproxy-traffic.json | 0 .../core/host-resources.json | 0 .../core/instance-deep-dive.json | 0 .../observability-dashboards/core/logs-explorer.json | 0 .../core/network-deep-dive.json | 0 .../core/prometheus-health.json | 0 .../core/storage-filesystem.json | 0 .../data}/observability-dashboards/dashboard.yaml | 0 {incusos => bin}/deploy-awx | 0 {incusos => bin}/deploy-haproxy | 0 {incusos => bin}/deploy-observability | 0 {incusos => bin/diagnostic}/investigate-boot | 0 {incusos => bin/diagnostic}/investigate-parallel | 0 {incusos => bin/diagnostic}/observe-deploy | 0 {incusos => bin/diagnostic}/test-boot-reliability | 0 {incusos => bin}/examples/incus-cluster-node.yaml | 0 {incusos => bin}/examples/incus-standalone.yaml | 0 {incusos => bin}/examples/lab-advanced.yaml | 0 {incusos => bin}/examples/lab-cluster.yaml | 0 {incusos => bin}/examples/lab-iscsi-target.yaml | 0 {incusos => bin}/examples/lab-networking.yaml | 0 {incusos => bin}/examples/lab-oc-deploy.yaml | 0 {incusos => bin}/examples/lab-oc-nodes.yaml | 0 {incusos => bin}/examples/lab-oc.yaml | 0 {incusos => bin}/examples/lab-production.yaml | 0 {incusos => bin}/examples/lab-replace.yaml | 0 {incusos => bin}/examples/lab-single.yaml | 0 {incusos => bin}/examples/my-test.yaml | 0 {incusos => bin}/examples/network-static.yaml | 0 {incusos => bin}/examples/ops-center.yaml | 0 {incusos => bin}/examples/proxmox-lab.yaml | 0 {incusos => bin}/examples/proxmox-minimal.yaml | 0 {incusos => bin}/examples/proxmox.yaml.example | 0 {incusos => bin}/helpers/aether-browser | 0 {incusos => bin}/helpers/incus-mitm | 0 {incusos => bin}/helpers/incusos-health | 0 {incusos => bin}/helpers/ovn-inspect | 0 {incusos => bin}/helpers/proxmox-api | 0 {incusos => bin}/helpers/proxmox-screenshot | 0 {incusos => bin}/incusos-iso | 0 {incusos => bin}/incusos-proxmox | 0 {incusos => bin}/incusos-seed | 0 {incusos => bin}/lab-test | 0 {incusos => bin}/manage-dashboards | 0 {incusos => bin}/pve-api | 0 {incusos/targets => envs}/README.md | 0 {incusos/targets => envs}/beelink/lab-cluster.yaml | 0 .../targets => envs}/beelink/proxmox.yaml.example | 0 {incusos/targets => envs}/hetzner/awx.yaml | 0 {incusos/targets => envs}/hetzner/haproxy.yaml | 0 {incusos/targets => envs}/hetzner/lab-cluster.yaml | 0 .../targets => envs}/hetzner/lab-production.yaml | 0 envs/hetzner/proxmox.yaml | 12 ++++++++++++ .../targets => envs}/hetzner/proxmox.yaml.example | 0 {hetzner => envs/hetzner/setup}/README.md | 0 {hetzner => envs/hetzner/setup}/hetzner-lab-guide.md | 0 {hetzner => envs/hetzner/setup}/hetzner-setup.md | 0 {hetzner => envs/hetzner/setup}/proxmox-setup | 0 66 files changed, 12 insertions(+) rename {incusos => bin}/README.md (100%) rename {incusos => bin}/TESTING.md (100%) rename {incusos => bin/data}/awx-manifests/base/awx.yaml (100%) rename {incusos => bin/data}/awx-manifests/base/kustomization.yaml (100%) rename {incusos => bin/data}/awx-manifests/operator/kustomization.yaml (100%) rename {incusos => bin/data}/observability-dashboards/community/.gitkeep (100%) rename {incusos => bin/data}/observability-dashboards/core/capacity-planning.json (100%) rename {incusos => bin/data}/observability-dashboards/core/cluster-overview.json (100%) rename {incusos => bin/data}/observability-dashboards/core/haproxy-traffic.json (100%) rename {incusos => bin/data}/observability-dashboards/core/host-resources.json (100%) rename {incusos => bin/data}/observability-dashboards/core/instance-deep-dive.json (100%) rename {incusos => bin/data}/observability-dashboards/core/logs-explorer.json (100%) rename {incusos => bin/data}/observability-dashboards/core/network-deep-dive.json (100%) rename {incusos => bin/data}/observability-dashboards/core/prometheus-health.json (100%) rename {incusos => bin/data}/observability-dashboards/core/storage-filesystem.json (100%) rename {incusos => bin/data}/observability-dashboards/dashboard.yaml (100%) rename {incusos => bin}/deploy-awx (100%) rename {incusos => bin}/deploy-haproxy (100%) rename {incusos => bin}/deploy-observability (100%) rename {incusos => bin/diagnostic}/investigate-boot (100%) rename {incusos => bin/diagnostic}/investigate-parallel (100%) rename {incusos => bin/diagnostic}/observe-deploy (100%) rename {incusos => bin/diagnostic}/test-boot-reliability (100%) rename {incusos => bin}/examples/incus-cluster-node.yaml (100%) rename {incusos => bin}/examples/incus-standalone.yaml (100%) rename {incusos => bin}/examples/lab-advanced.yaml (100%) rename {incusos => bin}/examples/lab-cluster.yaml (100%) rename {incusos => bin}/examples/lab-iscsi-target.yaml (100%) rename {incusos => bin}/examples/lab-networking.yaml (100%) rename {incusos => bin}/examples/lab-oc-deploy.yaml (100%) rename {incusos => bin}/examples/lab-oc-nodes.yaml (100%) rename {incusos => bin}/examples/lab-oc.yaml (100%) rename {incusos => bin}/examples/lab-production.yaml (100%) rename {incusos => bin}/examples/lab-replace.yaml (100%) rename {incusos => bin}/examples/lab-single.yaml (100%) rename {incusos => bin}/examples/my-test.yaml (100%) rename {incusos => bin}/examples/network-static.yaml (100%) rename {incusos => bin}/examples/ops-center.yaml (100%) rename {incusos => bin}/examples/proxmox-lab.yaml (100%) rename {incusos => bin}/examples/proxmox-minimal.yaml (100%) rename {incusos => bin}/examples/proxmox.yaml.example (100%) rename {incusos => bin}/helpers/aether-browser (100%) rename {incusos => bin}/helpers/incus-mitm (100%) rename {incusos => bin}/helpers/incusos-health (100%) rename {incusos => bin}/helpers/ovn-inspect (100%) rename {incusos => bin}/helpers/proxmox-api (100%) rename {incusos => bin}/helpers/proxmox-screenshot (100%) rename {incusos => bin}/incusos-iso (100%) rename {incusos => bin}/incusos-proxmox (100%) rename {incusos => bin}/incusos-seed (100%) rename {incusos => bin}/lab-test (100%) rename {incusos => bin}/manage-dashboards (100%) rename {incusos => bin}/pve-api (100%) rename {incusos/targets => envs}/README.md (100%) rename {incusos/targets => envs}/beelink/lab-cluster.yaml (100%) rename {incusos/targets => envs}/beelink/proxmox.yaml.example (100%) rename {incusos/targets => envs}/hetzner/awx.yaml (100%) rename {incusos/targets => envs}/hetzner/haproxy.yaml (100%) rename {incusos/targets => envs}/hetzner/lab-cluster.yaml (100%) rename {incusos/targets => envs}/hetzner/lab-production.yaml (100%) create mode 100644 envs/hetzner/proxmox.yaml rename {incusos/targets => envs}/hetzner/proxmox.yaml.example (100%) rename {hetzner => envs/hetzner/setup}/README.md (100%) rename {hetzner => envs/hetzner/setup}/hetzner-lab-guide.md (100%) rename {hetzner => envs/hetzner/setup}/hetzner-setup.md (100%) rename {hetzner => envs/hetzner/setup}/proxmox-setup (100%) diff --git a/incusos/README.md b/bin/README.md similarity index 100% rename from incusos/README.md rename to bin/README.md diff --git a/incusos/TESTING.md b/bin/TESTING.md similarity index 100% rename from incusos/TESTING.md rename to bin/TESTING.md diff --git a/incusos/awx-manifests/base/awx.yaml b/bin/data/awx-manifests/base/awx.yaml similarity index 100% rename from incusos/awx-manifests/base/awx.yaml rename to bin/data/awx-manifests/base/awx.yaml diff --git a/incusos/awx-manifests/base/kustomization.yaml b/bin/data/awx-manifests/base/kustomization.yaml similarity index 100% rename from incusos/awx-manifests/base/kustomization.yaml rename to bin/data/awx-manifests/base/kustomization.yaml diff --git a/incusos/awx-manifests/operator/kustomization.yaml b/bin/data/awx-manifests/operator/kustomization.yaml similarity index 100% rename from incusos/awx-manifests/operator/kustomization.yaml rename to bin/data/awx-manifests/operator/kustomization.yaml diff --git a/incusos/observability-dashboards/community/.gitkeep b/bin/data/observability-dashboards/community/.gitkeep similarity index 100% rename from incusos/observability-dashboards/community/.gitkeep rename to bin/data/observability-dashboards/community/.gitkeep diff --git a/incusos/observability-dashboards/core/capacity-planning.json b/bin/data/observability-dashboards/core/capacity-planning.json similarity index 100% rename from incusos/observability-dashboards/core/capacity-planning.json rename to bin/data/observability-dashboards/core/capacity-planning.json diff --git a/incusos/observability-dashboards/core/cluster-overview.json b/bin/data/observability-dashboards/core/cluster-overview.json similarity index 100% rename from incusos/observability-dashboards/core/cluster-overview.json rename to bin/data/observability-dashboards/core/cluster-overview.json diff --git a/incusos/observability-dashboards/core/haproxy-traffic.json b/bin/data/observability-dashboards/core/haproxy-traffic.json similarity index 100% rename from incusos/observability-dashboards/core/haproxy-traffic.json rename to bin/data/observability-dashboards/core/haproxy-traffic.json diff --git a/incusos/observability-dashboards/core/host-resources.json b/bin/data/observability-dashboards/core/host-resources.json similarity index 100% rename from incusos/observability-dashboards/core/host-resources.json rename to bin/data/observability-dashboards/core/host-resources.json diff --git a/incusos/observability-dashboards/core/instance-deep-dive.json b/bin/data/observability-dashboards/core/instance-deep-dive.json similarity index 100% rename from incusos/observability-dashboards/core/instance-deep-dive.json rename to bin/data/observability-dashboards/core/instance-deep-dive.json diff --git a/incusos/observability-dashboards/core/logs-explorer.json b/bin/data/observability-dashboards/core/logs-explorer.json similarity index 100% rename from incusos/observability-dashboards/core/logs-explorer.json rename to bin/data/observability-dashboards/core/logs-explorer.json diff --git a/incusos/observability-dashboards/core/network-deep-dive.json b/bin/data/observability-dashboards/core/network-deep-dive.json similarity index 100% rename from incusos/observability-dashboards/core/network-deep-dive.json rename to bin/data/observability-dashboards/core/network-deep-dive.json diff --git a/incusos/observability-dashboards/core/prometheus-health.json b/bin/data/observability-dashboards/core/prometheus-health.json similarity index 100% rename from incusos/observability-dashboards/core/prometheus-health.json rename to bin/data/observability-dashboards/core/prometheus-health.json diff --git a/incusos/observability-dashboards/core/storage-filesystem.json b/bin/data/observability-dashboards/core/storage-filesystem.json similarity index 100% rename from incusos/observability-dashboards/core/storage-filesystem.json rename to bin/data/observability-dashboards/core/storage-filesystem.json diff --git a/incusos/observability-dashboards/dashboard.yaml b/bin/data/observability-dashboards/dashboard.yaml similarity index 100% rename from incusos/observability-dashboards/dashboard.yaml rename to bin/data/observability-dashboards/dashboard.yaml diff --git a/incusos/deploy-awx b/bin/deploy-awx similarity index 100% rename from incusos/deploy-awx rename to bin/deploy-awx diff --git a/incusos/deploy-haproxy b/bin/deploy-haproxy similarity index 100% rename from incusos/deploy-haproxy rename to bin/deploy-haproxy diff --git a/incusos/deploy-observability b/bin/deploy-observability similarity index 100% rename from incusos/deploy-observability rename to bin/deploy-observability diff --git a/incusos/investigate-boot b/bin/diagnostic/investigate-boot similarity index 100% rename from incusos/investigate-boot rename to bin/diagnostic/investigate-boot diff --git a/incusos/investigate-parallel b/bin/diagnostic/investigate-parallel similarity index 100% rename from incusos/investigate-parallel rename to bin/diagnostic/investigate-parallel diff --git a/incusos/observe-deploy b/bin/diagnostic/observe-deploy similarity index 100% rename from incusos/observe-deploy rename to bin/diagnostic/observe-deploy diff --git a/incusos/test-boot-reliability b/bin/diagnostic/test-boot-reliability similarity index 100% rename from incusos/test-boot-reliability rename to bin/diagnostic/test-boot-reliability diff --git a/incusos/examples/incus-cluster-node.yaml b/bin/examples/incus-cluster-node.yaml similarity index 100% rename from incusos/examples/incus-cluster-node.yaml rename to bin/examples/incus-cluster-node.yaml diff --git a/incusos/examples/incus-standalone.yaml b/bin/examples/incus-standalone.yaml similarity index 100% rename from incusos/examples/incus-standalone.yaml rename to bin/examples/incus-standalone.yaml diff --git a/incusos/examples/lab-advanced.yaml b/bin/examples/lab-advanced.yaml similarity index 100% rename from incusos/examples/lab-advanced.yaml rename to bin/examples/lab-advanced.yaml diff --git a/incusos/examples/lab-cluster.yaml b/bin/examples/lab-cluster.yaml similarity index 100% rename from incusos/examples/lab-cluster.yaml rename to bin/examples/lab-cluster.yaml diff --git a/incusos/examples/lab-iscsi-target.yaml b/bin/examples/lab-iscsi-target.yaml similarity index 100% rename from incusos/examples/lab-iscsi-target.yaml rename to bin/examples/lab-iscsi-target.yaml diff --git a/incusos/examples/lab-networking.yaml b/bin/examples/lab-networking.yaml similarity index 100% rename from incusos/examples/lab-networking.yaml rename to bin/examples/lab-networking.yaml diff --git a/incusos/examples/lab-oc-deploy.yaml b/bin/examples/lab-oc-deploy.yaml similarity index 100% rename from incusos/examples/lab-oc-deploy.yaml rename to bin/examples/lab-oc-deploy.yaml diff --git a/incusos/examples/lab-oc-nodes.yaml b/bin/examples/lab-oc-nodes.yaml similarity index 100% rename from incusos/examples/lab-oc-nodes.yaml rename to bin/examples/lab-oc-nodes.yaml diff --git a/incusos/examples/lab-oc.yaml b/bin/examples/lab-oc.yaml similarity index 100% rename from incusos/examples/lab-oc.yaml rename to bin/examples/lab-oc.yaml diff --git a/incusos/examples/lab-production.yaml b/bin/examples/lab-production.yaml similarity index 100% rename from incusos/examples/lab-production.yaml rename to bin/examples/lab-production.yaml diff --git a/incusos/examples/lab-replace.yaml b/bin/examples/lab-replace.yaml similarity index 100% rename from incusos/examples/lab-replace.yaml rename to bin/examples/lab-replace.yaml diff --git a/incusos/examples/lab-single.yaml b/bin/examples/lab-single.yaml similarity index 100% rename from incusos/examples/lab-single.yaml rename to bin/examples/lab-single.yaml diff --git a/incusos/examples/my-test.yaml b/bin/examples/my-test.yaml similarity index 100% rename from incusos/examples/my-test.yaml rename to bin/examples/my-test.yaml diff --git a/incusos/examples/network-static.yaml b/bin/examples/network-static.yaml similarity index 100% rename from incusos/examples/network-static.yaml rename to bin/examples/network-static.yaml diff --git a/incusos/examples/ops-center.yaml b/bin/examples/ops-center.yaml similarity index 100% rename from incusos/examples/ops-center.yaml rename to bin/examples/ops-center.yaml diff --git a/incusos/examples/proxmox-lab.yaml b/bin/examples/proxmox-lab.yaml similarity index 100% rename from incusos/examples/proxmox-lab.yaml rename to bin/examples/proxmox-lab.yaml diff --git a/incusos/examples/proxmox-minimal.yaml b/bin/examples/proxmox-minimal.yaml similarity index 100% rename from incusos/examples/proxmox-minimal.yaml rename to bin/examples/proxmox-minimal.yaml diff --git a/incusos/examples/proxmox.yaml.example b/bin/examples/proxmox.yaml.example similarity index 100% rename from incusos/examples/proxmox.yaml.example rename to bin/examples/proxmox.yaml.example diff --git a/incusos/helpers/aether-browser b/bin/helpers/aether-browser similarity index 100% rename from incusos/helpers/aether-browser rename to bin/helpers/aether-browser diff --git a/incusos/helpers/incus-mitm b/bin/helpers/incus-mitm similarity index 100% rename from incusos/helpers/incus-mitm rename to bin/helpers/incus-mitm diff --git a/incusos/helpers/incusos-health b/bin/helpers/incusos-health similarity index 100% rename from incusos/helpers/incusos-health rename to bin/helpers/incusos-health diff --git a/incusos/helpers/ovn-inspect b/bin/helpers/ovn-inspect similarity index 100% rename from incusos/helpers/ovn-inspect rename to bin/helpers/ovn-inspect diff --git a/incusos/helpers/proxmox-api b/bin/helpers/proxmox-api similarity index 100% rename from incusos/helpers/proxmox-api rename to bin/helpers/proxmox-api diff --git a/incusos/helpers/proxmox-screenshot b/bin/helpers/proxmox-screenshot similarity index 100% rename from incusos/helpers/proxmox-screenshot rename to bin/helpers/proxmox-screenshot diff --git a/incusos/incusos-iso b/bin/incusos-iso similarity index 100% rename from incusos/incusos-iso rename to bin/incusos-iso diff --git a/incusos/incusos-proxmox b/bin/incusos-proxmox similarity index 100% rename from incusos/incusos-proxmox rename to bin/incusos-proxmox diff --git a/incusos/incusos-seed b/bin/incusos-seed similarity index 100% rename from incusos/incusos-seed rename to bin/incusos-seed diff --git a/incusos/lab-test b/bin/lab-test similarity index 100% rename from incusos/lab-test rename to bin/lab-test diff --git a/incusos/manage-dashboards b/bin/manage-dashboards similarity index 100% rename from incusos/manage-dashboards rename to bin/manage-dashboards diff --git a/incusos/pve-api b/bin/pve-api similarity index 100% rename from incusos/pve-api rename to bin/pve-api diff --git a/incusos/targets/README.md b/envs/README.md similarity index 100% rename from incusos/targets/README.md rename to envs/README.md diff --git a/incusos/targets/beelink/lab-cluster.yaml b/envs/beelink/lab-cluster.yaml similarity index 100% rename from incusos/targets/beelink/lab-cluster.yaml rename to envs/beelink/lab-cluster.yaml diff --git a/incusos/targets/beelink/proxmox.yaml.example b/envs/beelink/proxmox.yaml.example similarity index 100% rename from incusos/targets/beelink/proxmox.yaml.example rename to envs/beelink/proxmox.yaml.example diff --git a/incusos/targets/hetzner/awx.yaml b/envs/hetzner/awx.yaml similarity index 100% rename from incusos/targets/hetzner/awx.yaml rename to envs/hetzner/awx.yaml diff --git a/incusos/targets/hetzner/haproxy.yaml b/envs/hetzner/haproxy.yaml similarity index 100% rename from incusos/targets/hetzner/haproxy.yaml rename to envs/hetzner/haproxy.yaml diff --git a/incusos/targets/hetzner/lab-cluster.yaml b/envs/hetzner/lab-cluster.yaml similarity index 100% rename from incusos/targets/hetzner/lab-cluster.yaml rename to envs/hetzner/lab-cluster.yaml diff --git a/incusos/targets/hetzner/lab-production.yaml b/envs/hetzner/lab-production.yaml similarity index 100% rename from incusos/targets/hetzner/lab-production.yaml rename to envs/hetzner/lab-production.yaml diff --git a/envs/hetzner/proxmox.yaml b/envs/hetzner/proxmox.yaml new file mode 100644 index 0000000..7498c53 --- /dev/null +++ b/envs/hetzner/proxmox.yaml @@ -0,0 +1,12 @@ +host: 10.10.0.1 +method: api +api_token_id: automation@pve!deploy +api_token_secret: f7ed66bc-b1c9-4696-b4a9-c64f158c2a51 +node: aether-lab +storage: local-zfs +iso_storage: local +bridge: vmbr1 +gateway: 10.10.0.1 +dns: 10.10.0.1 # Proxmox host serves DNS for VMs (dnsmasq on vmbr1) +pool: IncusLab +ssh_user: root diff --git a/incusos/targets/hetzner/proxmox.yaml.example b/envs/hetzner/proxmox.yaml.example similarity index 100% rename from incusos/targets/hetzner/proxmox.yaml.example rename to envs/hetzner/proxmox.yaml.example diff --git a/hetzner/README.md b/envs/hetzner/setup/README.md similarity index 100% rename from hetzner/README.md rename to envs/hetzner/setup/README.md diff --git a/hetzner/hetzner-lab-guide.md b/envs/hetzner/setup/hetzner-lab-guide.md similarity index 100% rename from hetzner/hetzner-lab-guide.md rename to envs/hetzner/setup/hetzner-lab-guide.md diff --git a/hetzner/hetzner-setup.md b/envs/hetzner/setup/hetzner-setup.md similarity index 100% rename from hetzner/hetzner-setup.md rename to envs/hetzner/setup/hetzner-setup.md diff --git a/hetzner/proxmox-setup b/envs/hetzner/setup/proxmox-setup similarity index 100% rename from hetzner/proxmox-setup rename to envs/hetzner/setup/proxmox-setup