From cca629d84f0836b97fdc4e921696e1093804f95f Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 17 Dec 2019 22:25:10 +0100 Subject: [PATCH] Update kube1 and add k1-3 --- clusters/kube1/default.nix | 56 ++++++++++++++---------- clusters/kube1/k1-3.nix | 21 +++++++++ clusters/kube1/registry-auth-secret.yaml | 7 +++ 3 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 clusters/kube1/k1-3.nix create mode 100644 clusters/kube1/registry-auth-secret.yaml diff --git a/clusters/kube1/default.nix b/clusters/kube1/default.nix index 2d1d6e9..236171a 100644 --- a/clusters/kube1/default.nix +++ b/clusters/kube1/default.nix @@ -1,32 +1,44 @@ with import {}; let - settings = rec { + settings = { clusterName = "kube1"; - master = "k1-0"; - workers = [ "k1-1" "k1-2" ]; - masterAddress = "10.253.18.109"; - apiserverAddress = "https://${masterAddress}:4443"; - clusterHosts = '' - 10.253.18.109 k1-0 kubernetes fs0-2 - 10.253.18.110 k1-1 - 10.253.18.111 k1-2 - 10.253.18.106 fs0-0 - 10.1.2.164 fs0-1 - 10.253.18.100 k0-0 - 10.253.18.100 gitlab.itpartner.no registry.itpartner.no minio.itpartner.no - ''; + master = { + name = "k1-0"; address = "10.253.18.109"; + }; + workers = [ + { name = "k1-1"; address = "10.253.18.110"; } + { name = "k1-2"; address = "10.253.18.111"; } + { name = "k1-3"; address = "10.253.18.108"; } + ]; + cidr = "10.11.0.0/16"; + initca = ./ca; + fileserver = "fs0-0"; + clusterHosts = ""; adminAuthorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUqiMnQAj5ZkFLjtBLGkVJy2/uH/dnql/92BUMs8a/W7QULnocC2y08dlD+gITP+iKUFYasrYvqBgzKWvxsJmEodkMNr7iBUlKdjiVZNWEM38IgoZbd0iDYIUyDyIlGWRfshc00FX3ecplmylZcDXqFKtGSAafQAt8wZdNmzaHiC0hBYz3x9i2x0lWcq7UXXdNd581BMNj1FqObIoKetKy+4MxZP3oc061HjIxx9m5D6krsWjz+tgkTgjrJGaMKz8aOiLYDw4F9iQSAISeVBSGNU9laPAmbi4t8tcgvBYZVo76GuhLMxRGj6Om2vOJDvbX2mYrSAJ8g5279gbC7mJddEczCyiewt5bRYVzajC8k46bAsxMMkXOVT6YnCz/0X0d8FGlA96NPn2W9oohD2Jx0fVPNJ055AcxU+WYWe5WvCYUAePaUJW/EZSPPY08di4yoJzaJASXCrXtd7aZCh2ndxbZrn3m2KAbjuoBo69CenQGkBM+HjefMFnr9QCiqz2UbrotdQCzPUG1nwhqN409vg7VYQdWuN7wtFBVK7geG/dAJZBbxngNCdcCC4fQUuXV/DjQqOkCkItCYyTRHUHX/Qrdsfm6wrJfcZy5CZQkz9H2/HuMwG7jaiACI+5nAz0A7S6eKnlkoSM9sAOVsP6S4m9eLwbK6GfM4hoeCjNisQ== dag.brattli@itpartner.no" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWEYtm1u3HiK4q4J5su6iKWfFjLXt9CIlm9Z9BfJYVj jens@itpartner@Jens-HP3" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no" ]; + acme_email = "innovasjon@itpartner.no"; + grafana_smtp_user = "utvikling"; + grafana_smtp_password = "S0m3rp0m@de#21!"; + grafana_ldap_toml = '' + 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"] + ''; }; - cluster = callPackage ../../lib/k8s.nix { here = ./.; inherit settings; }; in -{ - k1-0 = cluster.apiserver "10.253.18.109" "k1-0"; - k1-1 = cluster.worker "10.253.18.110" "k1-1"; - k1-2 = cluster.worker "10.253.18.111" "k1-2"; -} + import ../../lib/k8s.nix { + inherit pkgs lib settings; + here = ./.; + } diff --git a/clusters/kube1/k1-3.nix b/clusters/kube1/k1-3.nix new file mode 100644 index 0000000..fe4ae9d --- /dev/null +++ b/clusters/kube1/k1-3.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/67441b95-19f2-484d-b57b-3f4b2a55f3cc"; + fsType = "ext4"; + }; + + swapDevices = [ ]; + + nix.maxJobs = lib.mkDefault 1; +} diff --git a/clusters/kube1/registry-auth-secret.yaml b/clusters/kube1/registry-auth-secret.yaml new file mode 100644 index 0000000..84e46ec --- /dev/null +++ b/clusters/kube1/registry-auth-secret.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +data: + .dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL3JlZ2lzdHJ5Lml0cGFydG5lci5ubyI6eyJ1c2VybmFtZSI6ImpvbmFzIiwicGFzc3dvcmQiOiJTRldwLVk0bkVfdXpNZFJxeHp6SyIsImF1dGgiOiJhbTl1WVhNNlUwWlhjQzFaTkc1RlgzVjZUV1JTY1hoNmVrcz0ifX19 +kind: Secret +metadata: + name: registry-auth +type: kubernetes.io/dockerconfigjson