diff --git a/clusters/kube2/bootstrap.conf b/clusters/kube2/bootstrap.conf deleted file mode 100644 index c84732f..0000000 --- a/clusters/kube2/bootstrap.conf +++ /dev/null @@ -1,19 +0,0 @@ -acme_email="innovasjon@itpartner.no" -grafana_smtp_user="utvikling" -grafana_smtp_password="S0m3rp0m@de#21!" -fileserver="fs0-0" -read -r -d '' grafana_ldap_toml << EOM -verbose_logging = true - -[[servers]] -host = "itp-dc1.itpartner.intern" -port = 636 -use_ssl = true -start_tls = false -ssl_skip_verify = true -bind_dn = "gitlab@itpartner.intern" -bind_password = "hipp hopp snipp snopp" -search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))" -search_base_dns = ["DC=itpartner,DC=intern"] -EOM -# vim:ft=sh diff --git a/clusters/kube2/default.nix b/clusters/kube2/default.nix index fe8ecc7..a9c7d48 100644 --- a/clusters/kube2/default.nix +++ b/clusters/kube2/default.nix @@ -10,6 +10,7 @@ let { name = "k2-2"; address = "10.253.18.116"; } { name = "k2-3"; address = "10.253.18.117"; } { name = "k2-4"; address = "10.253.18.118"; } + { name = "k2-5"; address = "10.253.18.103"; } ]; cidr = "10.11.0.0/16"; initca = ./ca; @@ -21,19 +22,19 @@ let 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.253.18.103 k0-3 k0-3.itpartner.no k0-3.itpartner.intern - 10.253.18.107 k0-4 k0-4.itpartner.no k0-4.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.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 ''; adminAuthorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" diff --git a/clusters/kube2/k2-5.nix b/clusters/kube2/k2-5.nix new file mode 100644 index 0000000..e380fbb --- /dev/null +++ b/clusters/kube2/k2-5.nix @@ -0,0 +1,21 @@ +# 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, ... }: + +{ + imports = [ ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/6b3a3c7b-b8dc-4274-a189-21fbe4d8a488"; + fsType = "ext4"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 1; +}