diff --git a/AGENTS.md b/AGENTS.md index 639f25e3..9667a0ae 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -61,7 +61,7 @@ deployments. Keep repository guidance here; reusable global rules live in `agent - Deployment and upload recipes change systems; use eval/build commands for validation. Remote deployment requires an explicit request. When deployment behavior changes, report the exact `just` command to run. -- KubeVirt hosts (`kubevirt-shoryu`/`shushou`/`youko`): avoid mid-flight restarts of the network +- KubeVirt hosts (`shoryu`/`shushou`/`youko`): avoid mid-flight restarts of the network stack (`systemd-networkd` / the `br0` bridge) — that can drop the VM network. Use `boot` + serial reboot for networking or nixpkgs changes. See [hosts/README.md](./hosts/README.md#deploying-kubevirt-hosts). diff --git a/Justfile b/Justfile index 1b5278b7..0cd13621 100644 --- a/Justfile +++ b/Justfile @@ -197,7 +197,7 @@ upload-vm name size verbosity="normal": use {{utils_nu}} *; upload-vm {{name}} {{size}} {{verbosity}} -# Deploy all the KubeVirt nodes(Physical machines running KubeVirt) +# Deploy all the VM hosts (physical machines running the VMs) [linux] [group('homelab')] lab mode="switch": @@ -206,17 +206,17 @@ lab mode="switch": [linux] [group('homelab')] shoryu mode="switch": - colmena apply {{mode}} --on '@kubevirt-shoryu' --verbose --show-trace + colmena apply {{mode}} --on '@shoryu' --verbose --show-trace [linux] [group('homelab')] shushou mode="switch": - colmena apply {{mode}} --on '@kubevirt-shushou' --verbose --show-trace + colmena apply {{mode}} --on '@shushou' --verbose --show-trace [linux] [group('homelab')] youko mode="switch": - colmena apply {{mode}} --on '@kubevirt-youko' --verbose --show-trace + colmena apply {{mode}} --on '@youko' --verbose --show-trace ############################################################################ # diff --git a/Virtual-Machine.md b/Virtual-Machine.md index c0d31c1c..056a28dd 100644 --- a/Virtual-Machine.md +++ b/Virtual-Machine.md @@ -1,6 +1,6 @@ ## How to create & managage KubeVirt's Virtual Machine from this flake? -> [!NOTE] KubeVirt is being retired. aquamarine runs natively on `kubevirt-youko` and the k3s-test +> [!NOTE] KubeVirt is being retired. aquamarine runs natively on `youko` and the k3s-test > nodes run as [microVMs](./hosts/k8s/README.md); this document only covers the KubeVirt VMs that > are left to move (currently the Windows VM). @@ -22,7 +22,7 @@ commands: ```shell just col aquamarine -just col kubevirt-shoryu +just col shoryu # Set a configuration for the next boot instead of switching immediately just col aquamarine boot diff --git a/hosts/k8s/kubevirt-shoryu/default.nix b/hosts/12kingdoms-shoryu/default.nix similarity index 88% rename from hosts/k8s/kubevirt-shoryu/default.nix rename to hosts/12kingdoms-shoryu/default.nix index 360b987d..2a798b97 100644 --- a/hosts/k8s/kubevirt-shoryu/default.nix +++ b/hosts/12kingdoms-shoryu/default.nix @@ -8,7 +8,7 @@ }: let # MoreFine - S500Plus - hostName = "kubevirt-shoryu"; # Define your hostname. + hostName = "shoryu"; # Define your hostname. coreModule = mylib.genVmHostModule { inherit pkgs hostName; @@ -18,7 +18,7 @@ in { imports = (mylib.scanPaths ./.) ++ [ disko.nixosModules.default - ../disko-config/kubevirt-disko-fs.nix + ../k8s/disko-config/host-disko-fs.nix ./hardware-configuration.nix ./preservation.nix coreModule diff --git a/hosts/k8s/kubevirt-shoryu/hardware-configuration.nix b/hosts/12kingdoms-shoryu/hardware-configuration.nix similarity index 100% rename from hosts/k8s/kubevirt-shoryu/hardware-configuration.nix rename to hosts/12kingdoms-shoryu/hardware-configuration.nix diff --git a/hosts/k8s/kubevirt-shoryu/libvirtd.nix b/hosts/12kingdoms-shoryu/libvirtd.nix similarity index 100% rename from hosts/k8s/kubevirt-shoryu/libvirtd.nix rename to hosts/12kingdoms-shoryu/libvirtd.nix diff --git a/hosts/k8s/kubevirt-shoryu/microvm.nix b/hosts/12kingdoms-shoryu/microvm.nix similarity index 93% rename from hosts/k8s/kubevirt-shoryu/microvm.nix rename to hosts/12kingdoms-shoryu/microvm.nix index fca62fb8..acbc92db 100644 --- a/hosts/k8s/kubevirt-shoryu/microvm.nix +++ b/hosts/12kingdoms-shoryu/microvm.nix @@ -21,7 +21,7 @@ mysecrets ; }; - config.imports = [ ../k3s-test-1-master-1 ]; + config.imports = [ ../k8s/k3s-test-1-master-1 ]; }; # Attach the guest's tap to the VM bridge, the same way the physical NIC is diff --git a/hosts/k8s/kubevirt-shoryu/preservation.nix b/hosts/12kingdoms-shoryu/preservation.nix similarity index 100% rename from hosts/k8s/kubevirt-shoryu/preservation.nix rename to hosts/12kingdoms-shoryu/preservation.nix diff --git a/hosts/k8s/kubevirt-shushou/default.nix b/hosts/12kingdoms-shushou/default.nix similarity index 77% rename from hosts/k8s/kubevirt-shushou/default.nix rename to hosts/12kingdoms-shushou/default.nix index 90bb7a17..22b8236a 100644 --- a/hosts/k8s/kubevirt-shushou/default.nix +++ b/hosts/12kingdoms-shushou/default.nix @@ -7,7 +7,7 @@ ... }: let - hostName = "kubevirt-shushou"; # Define your hostname. + hostName = "shushou"; # Define your hostname. coreModule = mylib.genVmHostModule { inherit pkgs hostName; @@ -17,9 +17,9 @@ in { imports = (mylib.scanPaths ./.) ++ [ disko.nixosModules.default - ../disko-config/kubevirt-disko-fs.nix - ../kubevirt-shoryu/hardware-configuration.nix - ../kubevirt-shoryu/preservation.nix + ../k8s/disko-config/host-disko-fs.nix + ../12kingdoms-shoryu/hardware-configuration.nix + ../12kingdoms-shoryu/preservation.nix coreModule ]; diff --git a/hosts/k8s/kubevirt-shushou/microvm.nix b/hosts/12kingdoms-shushou/microvm.nix similarity index 93% rename from hosts/k8s/kubevirt-shushou/microvm.nix rename to hosts/12kingdoms-shushou/microvm.nix index 72871125..4243fcf9 100644 --- a/hosts/k8s/kubevirt-shushou/microvm.nix +++ b/hosts/12kingdoms-shushou/microvm.nix @@ -21,7 +21,7 @@ mysecrets ; }; - config.imports = [ ../k3s-test-1-master-3 ]; + config.imports = [ ../k8s/k3s-test-1-master-3 ]; }; # Attach the guest's tap to the VM bridge, the same way the physical NIC is diff --git a/hosts/k8s/kubevirt-shushou/ups.nix b/hosts/12kingdoms-shushou/ups.nix similarity index 93% rename from hosts/k8s/kubevirt-shushou/ups.nix rename to hosts/12kingdoms-shushou/ups.nix index a79c0e60..ba538632 100644 --- a/hosts/k8s/kubevirt-shushou/ups.nix +++ b/hosts/12kingdoms-shushou/ups.nix @@ -1,6 +1,6 @@ { myvars, ... }: let - hostAddress = myvars.networking.hostsAddr.kubevirt-shushou.ipv4; + hostAddress = myvars.networking.hostsAddr.shushou.ipv4; in { power.ups = { diff --git a/hosts/k8s/kubevirt-youko/default.nix b/hosts/12kingdoms-youko/default.nix similarity index 80% rename from hosts/k8s/kubevirt-youko/default.nix rename to hosts/12kingdoms-youko/default.nix index 54d3d127..6d492e23 100644 --- a/hosts/k8s/kubevirt-youko/default.nix +++ b/hosts/12kingdoms-youko/default.nix @@ -7,7 +7,7 @@ ... }: let - hostName = "kubevirt-youko"; # Define your hostname. + hostName = "youko"; # Define your hostname. coreModule = mylib.genVmHostModule { inherit pkgs hostName; @@ -17,9 +17,9 @@ in { imports = (mylib.scanPaths ./.) ++ [ disko.nixosModules.default - ../disko-config/kubevirt-disko-fs.nix - ../kubevirt-shoryu/hardware-configuration.nix - ../kubevirt-shoryu/preservation.nix + ../k8s/disko-config/host-disko-fs.nix + ../12kingdoms-shoryu/hardware-configuration.nix + ../12kingdoms-shoryu/preservation.nix coreModule ]; diff --git a/hosts/k8s/kubevirt-youko/homelab-services.nix b/hosts/12kingdoms-youko/homelab-services.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services.nix rename to hosts/12kingdoms-youko/homelab-services.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/README.md b/hosts/12kingdoms-youko/homelab-services/README.md similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/README.md rename to hosts/12kingdoms-youko/homelab-services/README.md diff --git a/hosts/k8s/kubevirt-youko/homelab-services/caddy.nix b/hosts/12kingdoms-youko/homelab-services/caddy.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/caddy.nix rename to hosts/12kingdoms-youko/homelab-services/caddy.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/default.nix b/hosts/12kingdoms-youko/homelab-services/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/default.nix rename to hosts/12kingdoms-youko/homelab-services/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix b/hosts/12kingdoms-youko/homelab-services/disko-fs.nix similarity index 97% rename from hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix rename to hosts/12kingdoms-youko/homelab-services/disko-fs.nix index d242a67f..bf58417e 100644 --- a/hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix +++ b/hosts/12kingdoms-youko/homelab-services/disko-fs.nix @@ -1,7 +1,7 @@ # Auto disk partitioning (from repo root: nix-config): -# nix run github:nix-community/disko -- --mode destroy,format,mount hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix +# nix run github:nix-community/disko -- --mode destroy,format,mount hosts/12kingdoms-youko/homelab-services/disko-fs.nix # Mount only (after first format): -# nix run github:nix-community/disko -- --mode mount hosts/k8s/kubevirt-youko/homelab-services/disko-fs.nix +# nix run github:nix-community/disko -- --mode mount hosts/12kingdoms-youko/homelab-services/disko-fs.nix let cryptKeyFile = "/etc/agenix/hdd-luks-crypt-key"; unlockDisk = "data-encrypted"; diff --git a/hosts/k8s/kubevirt-youko/homelab-services/exporters/default.nix b/hosts/12kingdoms-youko/homelab-services/exporters/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/exporters/default.nix rename to hosts/12kingdoms-youko/homelab-services/exporters/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/gitea.nix b/hosts/12kingdoms-youko/homelab-services/gitea.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/gitea.nix rename to hosts/12kingdoms-youko/homelab-services/gitea.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards.nix b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards.nix rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/README.md b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/README.md similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/README.md rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/README.md diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/cloudnative-pg.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/databases/cloudnative-pg.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/cloudnative-pg.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/databases/cloudnative-pg.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/postgresql-database.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/databases/postgresql-database.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/databases/postgresql-database.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/databases/postgresql-database.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/alertmanager-9578_rev4.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/homelab/alertmanager-9578_rev4.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/alertmanager-9578_rev4.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/homelab/alertmanager-9578_rev4.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/nut-exporter.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/homelab/nut-exporter.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/homelab/nut-exporter.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/homelab/nut-exporter.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-extension-dashboard.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-extension-dashboard.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-extension-dashboard.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-extension-dashboard.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-mesh-dashboard.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-mesh-dashboard.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-mesh-dashboard.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-mesh-dashboard.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-performance-dashboard.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-performance-dashboard.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-performance-dashboard.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-performance-dashboard.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-service-dashboard.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-service-dashboard.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-service-dashboard.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-service-dashboard.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-workload-dashboard.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-workload-dashboard.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/istio-workload-dashboard.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/istio-workload-dashboard.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/pilot-dashboard.gen.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/pilot-dashboard.gen.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/pilot-dashboard.gen.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/pilot-dashboard.gen.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/ztunnel-dashboard.gen.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/ztunnel-dashboard.gen.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/istio/ztunnel-dashboard.gen.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/istio/ztunnel-dashboard.gen.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-api-server.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-api-server.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-api-server.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-api-server.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-coredns.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-coredns.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-coredns.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-system-coredns.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-global.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-global.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-global.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-global.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-namespaces.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-namespaces.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-namespaces.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-namespaces.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-nodes.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-nodes.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-nodes.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-nodes.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-pods.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-pods.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-pods.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-pods.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-service.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-service.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-service.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/k8s-views-service.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubernetes/kubernetes-persistent-volumes.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubevirt/kubevirt-control-plane.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubevirt/kubevirt-control-plane.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/kubevirt/kubevirt-control-plane.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/kubevirt/kubevirt-control-plane.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-chunks.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-chunks.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-chunks.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-chunks.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-deletion.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-deletion.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-deletion.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-deletion.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-logs.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-logs.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-logs.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-logs.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-operational.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-operational.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-operational.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-operational.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-retention.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-retention.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/loki-mixin/loki-retention.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/loki-mixin/loki-retention.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/victoriametrics/victoria-metrics-single.json b/hosts/12kingdoms-youko/homelab-services/grafana/dashboards/victoriametrics/victoria-metrics-single.json similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/dashboards/victoriametrics/victoria-metrics-single.json rename to hosts/12kingdoms-youko/homelab-services/grafana/dashboards/victoriametrics/victoria-metrics-single.json diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/datasources.nix b/hosts/12kingdoms-youko/homelab-services/grafana/datasources.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/datasources.nix rename to hosts/12kingdoms-youko/homelab-services/grafana/datasources.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/grafana/default.nix b/hosts/12kingdoms-youko/homelab-services/grafana/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/grafana/default.nix rename to hosts/12kingdoms-youko/homelab-services/grafana/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/README.md b/hosts/12kingdoms-youko/homelab-services/monitoring/README.md similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/README.md rename to hosts/12kingdoms-youko/homelab-services/monitoring/README.md diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert.nix b/hosts/12kingdoms-youko/homelab-services/monitoring/alert.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert.nix rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/README.md b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/README.md similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/README.md rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/README.md diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/argocd-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/argocd-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/argocd-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/argocd-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/coredns-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/coredns-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/coredns-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/coredns-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/etcd-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/etcd-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/etcd-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/etcd-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/fluxcd-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/fluxcd-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/fluxcd-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/fluxcd-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/general.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/general.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/general.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/general.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/istio-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/istio-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/istio-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/istio-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kube-state-metrics-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/kube-state-metrics-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kube-state-metrics-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/kube-state-metrics-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kubernetes.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/kubernetes.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/kubernetes.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/kubernetes.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/loki-exporter.yaml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/loki-exporter.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/loki-exporter.yaml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/loki-exporter.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/node-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/node-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/node-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/node-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/nut-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/nut-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/nut-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/nut-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/postgres-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/postgres-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/alert_rules/postgres-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/alert_rules/postgres-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/default.nix b/hosts/12kingdoms-youko/homelab-services/monitoring/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/default.nix rename to hosts/12kingdoms-youko/homelab-services/monitoring/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/README.md b/hosts/12kingdoms-youko/homelab-services/monitoring/recoding_rules/README.md similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/README.md rename to hosts/12kingdoms-youko/homelab-services/monitoring/recoding_rules/README.md diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/k8s.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/recoding_rules/k8s.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/k8s.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/recoding_rules/k8s.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/node-exporter.yml b/hosts/12kingdoms-youko/homelab-services/monitoring/recoding_rules/node-exporter.yml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/recoding_rules/node-exporter.yml rename to hosts/12kingdoms-youko/homelab-services/monitoring/recoding_rules/node-exporter.yml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/victoriametrics.nix b/hosts/12kingdoms-youko/homelab-services/monitoring/victoriametrics.nix similarity index 97% rename from hosts/k8s/kubevirt-youko/homelab-services/monitoring/victoriametrics.nix rename to hosts/12kingdoms-youko/homelab-services/monitoring/victoriametrics.nix index 6a907873..9aa828bc 100644 --- a/hosts/k8s/kubevirt-youko/homelab-services/monitoring/victoriametrics.nix +++ b/hosts/12kingdoms-youko/homelab-services/monitoring/victoriametrics.nix @@ -101,10 +101,10 @@ in params.ups = [ "homelab" ]; static_configs = [ { - targets = [ "${myvars.networking.hostsAddr.kubevirt-shushou.ipv4}:9199" ]; + targets = [ "${myvars.networking.hostsAddr.shushou.ipv4}:9199" ]; labels.type = "app"; labels.app = "nut"; - labels.host = "kubevirt-shushou"; + labels.host = "shushou"; labels.env = "homelab"; labels.cluster = "homelab"; } diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/default.nix b/hosts/12kingdoms-youko/homelab-services/oci-containers/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/default.nix rename to hosts/12kingdoms-youko/homelab-services/oci-containers/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/bookmarks.yaml b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/bookmarks.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/bookmarks.yaml rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/bookmarks.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.css b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/custom.css similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.css rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/custom.css diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.js b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/custom.js similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/custom.js rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/custom.js diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/docker.yaml b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/docker.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/docker.yaml rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/docker.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/kubernetes.yaml b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/kubernetes.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/kubernetes.yaml rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/kubernetes.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/services.yaml b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/services.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/services.yaml rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/services.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/settings.yaml b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/settings.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/settings.yaml rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/settings.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/widgets.yaml b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/widgets.yaml similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/config/widgets.yaml rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/config/widgets.yaml diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/default.nix b/hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/homepage/default.nix rename to hosts/12kingdoms-youko/homelab-services/oci-containers/homepage/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/oci-containers/uptime-kuma/default.nix b/hosts/12kingdoms-youko/homelab-services/oci-containers/uptime-kuma/default.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/oci-containers/uptime-kuma/default.nix rename to hosts/12kingdoms-youko/homelab-services/oci-containers/uptime-kuma/default.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/postgresql.nix b/hosts/12kingdoms-youko/homelab-services/postgresql.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/postgresql.nix rename to hosts/12kingdoms-youko/homelab-services/postgresql.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/proxy.nix b/hosts/12kingdoms-youko/homelab-services/proxy.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/proxy.nix rename to hosts/12kingdoms-youko/homelab-services/proxy.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/restic.nix b/hosts/12kingdoms-youko/homelab-services/restic.nix similarity index 97% rename from hosts/k8s/kubevirt-youko/homelab-services/restic.nix rename to hosts/12kingdoms-youko/homelab-services/restic.nix index 5f881b24..00e5d0f5 100644 --- a/hosts/k8s/kubevirt-youko/homelab-services/restic.nix +++ b/hosts/12kingdoms-youko/homelab-services/restic.nix @@ -44,9 +44,9 @@ in backupPrepareCommand = '' ${pkgs.nushell}/bin/nu -c ' let kubevirt_nodes = [ - "kubevirt-shoryu" - "kubevirt-shushou" - "kubevirt-youko" + "shoryu" + "shushou" + "youko" ] kubevirt_nodes | each {|it| diff --git a/hosts/k8s/kubevirt-youko/homelab-services/sftpgo.nix b/hosts/12kingdoms-youko/homelab-services/sftpgo.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/sftpgo.nix rename to hosts/12kingdoms-youko/homelab-services/sftpgo.nix diff --git a/hosts/k8s/kubevirt-youko/homelab-services/transmission.nix b/hosts/12kingdoms-youko/homelab-services/transmission.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/homelab-services/transmission.nix rename to hosts/12kingdoms-youko/homelab-services/transmission.nix diff --git a/hosts/k8s/kubevirt-youko/microvm.nix b/hosts/12kingdoms-youko/microvm.nix similarity index 93% rename from hosts/k8s/kubevirt-youko/microvm.nix rename to hosts/12kingdoms-youko/microvm.nix index 96150b0d..9a94af6a 100644 --- a/hosts/k8s/kubevirt-youko/microvm.nix +++ b/hosts/12kingdoms-youko/microvm.nix @@ -21,7 +21,7 @@ mysecrets ; }; - config.imports = [ ../k3s-test-1-master-2 ]; + config.imports = [ ../k8s/k3s-test-1-master-2 ]; }; # Attach the guest's tap to the VM bridge, the same way the physical NIC is diff --git a/hosts/k8s/kubevirt-youko/nfs-golden.nix b/hosts/12kingdoms-youko/nfs-golden.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/nfs-golden.nix rename to hosts/12kingdoms-youko/nfs-golden.nix diff --git a/hosts/k8s/kubevirt-youko/vpn.nix b/hosts/12kingdoms-youko/vpn.nix similarity index 100% rename from hosts/k8s/kubevirt-youko/vpn.nix rename to hosts/12kingdoms-youko/vpn.nix diff --git a/hosts/README.md b/hosts/README.md index a583e61f..b1f77f66 100644 --- a/hosts/README.md +++ b/hosts/README.md @@ -104,13 +104,13 @@ Use existing hosts as templates. The key files typically include: ### Examples to Reference - **Desktop systems**: See `idols-ai/` for gaming/workstation setup -- **Server systems**: See `kubevirt-shoryu/` for K8s/KubeVirt hosts +- **Server systems**: See `shoryu/` for K8s/KubeVirt hosts - **macOS systems**: See `darwin-fern/` for macOS configurations - **Apple Silicon**: See `12kingdoms-shoukei/` for ARM Linux setup ## Deploying KubeVirt Hosts -The three KubeVirt hosts (`kubevirt-shoryu`, `kubevirt-shushou`, `kubevirt-youko`) put their VMs' +The three KubeVirt hosts (`shoryu`, `shushou`, `youko`) put their VMs' secondary network on the Linux bridge `br0` (attached by the `bridge` CNI plugin); the pod network is Cilium (flannel disabled). diff --git a/hosts/k8s/README.md b/hosts/k8s/README.md index 64e26d1d..815686cb 100644 --- a/hosts/k8s/README.md +++ b/hosts/k8s/README.md @@ -39,11 +39,11 @@ keeps its identity and etcd membership instead of bootstraping a new cluster. ## TODO / Known issues -- **Retire KubeVirt.** aquamarine now runs natively on `kubevirt-youko`, and the k3s-test masters +- **Retire KubeVirt.** aquamarine now runs natively on `youko`, and the k3s-test masters run as microVMs. Remove KubeVirt/CDI/multus from the cluster (k8s-gitops) once nothing else needs them, and the Windows VM is the only KubeVirt VM left to move. - **The USB HDD bridge is flaky.** aquamarine's two HDDs sit behind a JMicron JMS567 USB-SATA bridge - that keeps resetting (`dmesg` on `kubevirt-youko`). Find out how often it resets and how much it + that keeps resetting (`dmesg` on `youko`). Find out how often it resets and how much it matters before putting anything critical (e.g. an NFS export) on it. ## Kubernetes Resources diff --git a/hosts/k8s/disko-config/README.md b/hosts/k8s/disko-config/README.md index 58d5fbae..0fcd0332 100644 --- a/hosts/k8s/disko-config/README.md +++ b/hosts/k8s/disko-config/README.md @@ -17,7 +17,7 @@ sudo nix --experimental-features "nix-command flakes" run github:nix-community/d systemd-cryptenroll --tpm2-device=auto --tpm2-pcrs=0+7 /dev/ ## 3. install nixos -sudo nixos-install --root /mnt --no-root-password --show-trace --verbose --flake .#kubevirt-shoryu +sudo nixos-install --root /mnt --no-root-password --show-trace --verbose --flake .#shoryu # enter into the installed system, check password & users # `su ryan` => `sudo -i` => enter ryan's password => successfully login diff --git a/hosts/k8s/disko-config/kubevirt-disko-fs.nix b/hosts/k8s/disko-config/host-disko-fs.nix similarity index 100% rename from hosts/k8s/disko-config/kubevirt-disko-fs.nix rename to hosts/k8s/disko-config/host-disko-fs.nix diff --git a/lib/colmenaSystem.nix b/lib/colmenaSystem.nix index 6615d86a..44ec7195 100644 --- a/lib/colmenaSystem.nix +++ b/lib/colmenaSystem.nix @@ -8,6 +8,9 @@ system, tags, ssh-user, + # optional override; defaults to the host name. Use an IP when the host's + # DNS name is not resolvable yet (e.g. right after a hostname change). + targetHost ? null, genSpecialArgs, specialArgs ? (genSpecialArgs system), ... @@ -20,7 +23,7 @@ in deployment = { inherit tags; targetUser = ssh-user; - targetHost = name; # hostName or IP address + targetHost = if targetHost != null then targetHost else name; }; imports = diff --git a/outputs/README.md b/outputs/README.md index 510a0cc8..30fd014b 100644 --- a/outputs/README.md +++ b/outputs/README.md @@ -97,9 +97,9 @@ All the outputs of this flake are defined here. │ ├── k3s-test-1-worker-1.nix │ ├── k3s-test-1-worker-2.nix │ ├── k3s-test-1-worker-3.nix - │   ├── kubevirt-shoryu.nix - │   ├── kubevirt-shushou.nix - │   └── kubevirt-youko.nix + │   ├── shoryu.nix + │   ├── shushou.nix + │   └── youko.nix └── tests # eval tests ├── home-manager │   ├── expected.nix diff --git a/outputs/x86_64-linux/src/kubevirt-shoryu.nix b/outputs/x86_64-linux/src/12kingdoms-shoryu.nix similarity index 77% rename from outputs/x86_64-linux/src/kubevirt-shoryu.nix rename to outputs/x86_64-linux/src/12kingdoms-shoryu.nix index 66e36225..16a9d35e 100644 --- a/outputs/x86_64-linux/src/kubevirt-shoryu.nix +++ b/outputs/x86_64-linux/src/12kingdoms-shoryu.nix @@ -11,7 +11,7 @@ ... }@args: let - name = "kubevirt-shoryu"; + name = "shoryu"; tags = [ name "virt-shoryu" @@ -25,7 +25,7 @@ let "secrets/nixos.nix" "modules/nixos/server/server.nix" # host specific - "hosts/k8s/${name}" + "hosts/12kingdoms-${name}" ]) ++ [ { @@ -43,7 +43,14 @@ in { nixosConfigurations.${name} = mylib.nixosSystem systemArgs; - colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); + colmena.${name} = mylib.colmenaSystem ( + systemArgs + // { + inherit tags ssh-user; + # reach the host by IP: its DNS name changes with the hostname + targetHost = myvars.networking.hostsAddr.${name}.ipv4; + } + ); packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.iso; } diff --git a/outputs/x86_64-linux/src/kubevirt-shushou.nix b/outputs/x86_64-linux/src/12kingdoms-shushou.nix similarity index 75% rename from outputs/x86_64-linux/src/kubevirt-shushou.nix rename to outputs/x86_64-linux/src/12kingdoms-shushou.nix index a211542b..764209c6 100644 --- a/outputs/x86_64-linux/src/kubevirt-shushou.nix +++ b/outputs/x86_64-linux/src/12kingdoms-shushou.nix @@ -11,7 +11,7 @@ ... }@args: let - name = "kubevirt-shushou"; + name = "shushou"; tags = [ name "virt-shushou" @@ -25,7 +25,7 @@ let "secrets/nixos.nix" "modules/nixos/server/server.nix" # host specific - "hosts/k8s/${name}" + "hosts/12kingdoms-${name}" ]) ++ [ { @@ -40,7 +40,14 @@ in { nixosConfigurations.${name} = mylib.nixosSystem systemArgs; - colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); + colmena.${name} = mylib.colmenaSystem ( + systemArgs + // { + inherit tags ssh-user; + # reach the host by IP: its DNS name changes with the hostname + targetHost = myvars.networking.hostsAddr.${name}.ipv4; + } + ); packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.iso; } diff --git a/outputs/x86_64-linux/src/kubevirt-youko.nix b/outputs/x86_64-linux/src/12kingdoms-youko.nix similarity index 75% rename from outputs/x86_64-linux/src/kubevirt-youko.nix rename to outputs/x86_64-linux/src/12kingdoms-youko.nix index c7453e03..d06115da 100644 --- a/outputs/x86_64-linux/src/kubevirt-youko.nix +++ b/outputs/x86_64-linux/src/12kingdoms-youko.nix @@ -11,7 +11,7 @@ ... }@args: let - name = "kubevirt-youko"; + name = "youko"; tags = [ name "virt-youko" @@ -25,7 +25,7 @@ let "secrets/nixos.nix" "modules/nixos/server/server.nix" # host specific - "hosts/k8s/${name}" + "hosts/12kingdoms-${name}" ]) ++ [ { @@ -40,7 +40,14 @@ in { nixosConfigurations.${name} = mylib.nixosSystem systemArgs; - colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); + colmena.${name} = mylib.colmenaSystem ( + systemArgs + // { + inherit tags ssh-user; + # reach the host by IP: its DNS name changes with the hostname + targetHost = myvars.networking.hostsAddr.${name}.ipv4; + } + ); packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.iso; } diff --git a/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix b/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix index e982827b..ad81b217 100644 --- a/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix +++ b/outputs/x86_64-linux/tests/security-aquamarine-metrics/expr.nix @@ -3,7 +3,7 @@ outputs, }: let - aqua = outputs.nixosConfigurations.kubevirt-youko.config; + aqua = outputs.nixosConfigurations.youko.config; in { v2rayExporter = aqua.services.prometheus.exporters.v2ray.listenAddress; diff --git a/outputs/x86_64-linux/tests/ups-metrics/expected.nix b/outputs/x86_64-linux/tests/ups-metrics/expected.nix index 0bec1357..dc98ffe4 100644 --- a/outputs/x86_64-linux/tests/ups-metrics/expected.nix +++ b/outputs/x86_64-linux/tests/ups-metrics/expected.nix @@ -36,7 +36,7 @@ labels = { type = "app"; app = "nut"; - host = "kubevirt-shushou"; + host = "shushou"; env = "homelab"; cluster = "homelab"; }; diff --git a/outputs/x86_64-linux/tests/ups-metrics/expr.nix b/outputs/x86_64-linux/tests/ups-metrics/expr.nix index 7457f11b..125a5207 100644 --- a/outputs/x86_64-linux/tests/ups-metrics/expr.nix +++ b/outputs/x86_64-linux/tests/ups-metrics/expr.nix @@ -4,8 +4,8 @@ ... }: let - shushou = outputs.nixosConfigurations.kubevirt-shushou.config; - aquamarine = outputs.nixosConfigurations.kubevirt-youko.config; + shushou = outputs.nixosConfigurations.shushou.config; + aquamarine = outputs.nixosConfigurations.youko.config; ups = shushou.power.ups.ups.homelab or { }; exporter = shushou.services.prometheus.exporters.nut; exporterService = diff --git a/vars/networking.nix b/vars/networking.nix index f37208f0..c633d398 100644 --- a/vars/networking.nix +++ b/vars/networking.nix @@ -20,17 +20,17 @@ rec { hostsAddr = { # ============================================ - # Homelab's Physical Machines (KubeVirt Nodes) + # Homelab's Physical Machines (VM hosts) # ============================================ - kubevirt-shoryu = { + shoryu = { iface = "eno1"; ipv4 = "192.168.5.181"; }; - kubevirt-shushou = { + shushou = { iface = "eno1"; ipv4 = "192.168.5.182"; }; - kubevirt-youko = { + youko = { iface = "eno1"; ipv4 = "192.168.5.183"; };