cluster: rename module-* into modules/*
Change-Id: I65e06f3e9cec2ba0071259eb755eddbbd1025b97
diff --git a/cluster/nix/module-base.nix b/cluster/nix/modules/base.nix
similarity index 97%
rename from cluster/nix/module-base.nix
rename to cluster/nix/modules/base.nix
index cd7c2d9..84530c3 100644
--- a/cluster/nix/module-base.nix
+++ b/cluster/nix/modules/base.nix
@@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
-with (( import ./defs-cluster-k0.nix ) config.networking.hostName);
+with (( import ../defs-cluster-k0.nix ) config.networking.hostName);
rec {
system.stateVersion = machine.stateVersion;
diff --git a/cluster/nix/module-kubelet.nix b/cluster/nix/modules/kubelet.nix
similarity index 100%
rename from cluster/nix/module-kubelet.nix
rename to cluster/nix/modules/kubelet.nix
diff --git a/cluster/nix/module-kubernetes.nix b/cluster/nix/modules/kubernetes.nix
similarity index 98%
rename from cluster/nix/module-kubernetes.nix
rename to cluster/nix/modules/kubernetes.nix
index 6338f5e..59e8b4f 100644
--- a/cluster/nix/module-kubernetes.nix
+++ b/cluster/nix/modules/kubernetes.nix
@@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
-with (( import ./defs-cluster-k0.nix ) config.networking.hostName);
+with (( import ../defs-cluster-k0.nix ) config.networking.hostName);
let
# Pin for k8s packages. This is so that upagrading the system will not upgrade the k8s control or data planes.
k8spkgs = import (fetchGit {
@@ -27,7 +27,7 @@
imports =
[
- ./module-kubelet.nix
+ ./kubelet.nix
];
# List services that you want to enable:
diff --git a/cluster/nix/provision.nix b/cluster/nix/provision.nix
index dbe697b..70240f6 100644
--- a/cluster/nix/provision.nix
+++ b/cluster/nix/provision.nix
@@ -7,8 +7,8 @@
value = super.nixos ({ config, pkgs, ... }: {
networking.hostName = machine.name;
imports = [
- ./module-base.nix
- ./module-kubernetes.nix
+ ./modules/base.nix
+ ./modules/kubernetes.nix
];
});
}) machines);