From 26e0f6a4535778b9e66a521147aa1e3cb0919171 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Wed, 18 Nov 2020 15:08:36 +0100 Subject: [PATCH] New k0 in s2d cluster --- clusters/hosts.nix | 33 +++++++++++++-------------- clusters/k0/default.nix | 8 +++---- clusters/k0/k0-0.nix | 16 +++++++------ clusters/k0/k0-1.nix | 14 ++++++++---- clusters/k0/k0-2.nix | 14 ++++++++---- clusters/k0/registry-auth-secret.yaml | 7 ------ 6 files changed, 49 insertions(+), 43 deletions(-) delete mode 100644 clusters/k0/registry-auth-secret.yaml diff --git a/clusters/hosts.nix b/clusters/hosts.nix index 0ce3545..72bde91 100644 --- a/clusters/hosts.nix +++ b/clusters/hosts.nix @@ -1,22 +1,21 @@ '' - 10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern - 10.1.2.164 fs0-1 fs0-1.itpartner.no fs0-1.itpartner.intern - 10.1.2.117 fs2-0 fs2-0.itpartner.no fs2-0.itpartner.intern + 10.253.18.106 fs0-0 fs0-0.itpartner.intern + 10.1.2.117 fs2-0 fs2-0.itpartner.intern - 10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern - 10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern - 10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern + 10.1.8.53 k0-0 k0-0.itpartner.intern + 10.1.8.54 k0-1 k0-1.itpartner.intern + 10.1.8.55 k0-2 k0-2.itpartner.intern - 10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern - 10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern - 10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern - 10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern - 10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern + 10.253.18.109 k1-0 k1-0.itpartner.intern + 10.253.18.110 k1-1 k1-1.itpartner.intern + 10.253.18.111 k1-2 k1-2.itpartner.intern + 10.253.18.108 k1-3 k1-3.itpartner.intern + 10.253.18.107 k0-4 k1-4.itpartner.intern - 10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern - 10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern - 10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern - 10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern - 10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern - 10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern + 10.253.18.114 k2-0 k2-0.itpartner.intern + 10.253.18.115 k2-1 k2-1.itpartner.intern + 10.253.18.116 k2-2 k2-2.itpartner.intern + 10.253.18.117 k2-3 k2-3.itpartner.intern + 10.253.18.118 k2-4 k2-4.itpartner.intern + 10.253.18.103 k2-5 k2-5.itpartner.intern '' diff --git a/clusters/k0/default.nix b/clusters/k0/default.nix index 05c5d62..49be03d 100644 --- a/clusters/k0/default.nix +++ b/clusters/k0/default.nix @@ -3,12 +3,12 @@ let setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; }; hosts = [ - { name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; } - { name = "k0-2"; address = "10.253.18.102"; hw = ./k0-2.nix; } + { name = "k0-1"; address = "10.1.8.54"; hw = ./k0-1.nix; } + { name = "k0-2"; address = "10.1.8.55"; hw = ./k0-2.nix; } ]; customize = { - boot.bios = true; + boot.uefi = true; }; cluster = { @@ -26,7 +26,7 @@ let enable = true; master = { name = "k0-0"; - address = "10.253.18.100"; + address = "10.1.8.53"; extraSANs = [ "k0.itpartner.no" ]; hw = ./k0-0.nix; }; diff --git a/clusters/k0/k0-0.nix b/clusters/k0/k0-0.nix index c9475f1..0f7eaa0 100644 --- a/clusters/k0/k0-0.nix +++ b/clusters/k0/k0-0.nix @@ -1,25 +1,27 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = [ ]; - boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/46951acf-de3e-44c3-8d9d-4aa97e691630"; + { device = "/dev/disk/by-uuid/2306f185-eff6-43a4-b032-4c9f14fb0893"; fsType = "ext4"; }; - fileSystems."/vol/brick0" = - { device = "/dev/gfs_vg/brick0"; - fsType = "ext4"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3D9E-1634"; + fsType = "vfat"; }; swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 1; + virtualisation.hypervGuest.enable = true; } diff --git a/clusters/k0/k0-1.nix b/clusters/k0/k0-1.nix index a3d682e..5300af9 100644 --- a/clusters/k0/k0-1.nix +++ b/clusters/k0/k0-1.nix @@ -1,21 +1,27 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = [ ]; - boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/169fb935-f9f5-4689-a15f-7c4ef68553d0"; + { device = "/dev/disk/by-uuid/a44f60ee-fe60-4419-8a4d-c1f131e6bfc4"; fsType = "ext4"; }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3EEB-878E"; + fsType = "vfat"; + }; + swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 1; + virtualisation.hypervGuest.enable = true; } diff --git a/clusters/k0/k0-2.nix b/clusters/k0/k0-2.nix index d405583..7de1886 100644 --- a/clusters/k0/k0-2.nix +++ b/clusters/k0/k0-2.nix @@ -1,21 +1,27 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = [ ]; - boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/362221fe-f5a8-4abe-be5f-6f9bb4fc1d74"; + { device = "/dev/disk/by-uuid/89410434-e9aa-480c-b49e-4ea24dc80fc2"; fsType = "ext4"; }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3FDB-4765"; + fsType = "vfat"; + }; + swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 1; + virtualisation.hypervGuest.enable = true; } diff --git a/clusters/k0/registry-auth-secret.yaml b/clusters/k0/registry-auth-secret.yaml deleted file mode 100644 index 84e46ec..0000000 --- a/clusters/k0/registry-auth-secret.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - .dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL3JlZ2lzdHJ5Lml0cGFydG5lci5ubyI6eyJ1c2VybmFtZSI6ImpvbmFzIiwicGFzc3dvcmQiOiJTRldwLVk0bkVfdXpNZFJxeHp6SyIsImF1dGgiOiJhbTl1WVhNNlUwWlhjQzFaTkc1RlgzVjZUV1JTY1hoNmVrcz0ifX19 -kind: Secret -metadata: - name: registry-auth -type: kubernetes.io/dockerconfigjson