New k0 in s2d cluster

This commit is contained in:
Jonas Juselius
2020-11-18 15:08:36 +01:00
parent 6b947c5f92
commit 26e0f6a453
6 changed files with 49 additions and 43 deletions

View File

@@ -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;
};

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -1,7 +0,0 @@
apiVersion: v1
data:
.dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL3JlZ2lzdHJ5Lml0cGFydG5lci5ubyI6eyJ1c2VybmFtZSI6ImpvbmFzIiwicGFzc3dvcmQiOiJTRldwLVk0bkVfdXpNZFJxeHp6SyIsImF1dGgiOiJhbTl1WVhNNlUwWlhjQzFaTkc1RlgzVjZUV1JTY1hoNmVrcz0ifX19
kind: Secret
metadata:
name: registry-auth
type: kubernetes.io/dockerconfigjson