Merge branch 'topic/kubernetes-ng'

7 files changed, 151 insertions, 1 deletions

diff --git a/inventory/group_vars/k8s-test-2019vm/main.yml b/inventory/group_vars/k8s-test-2019vm/main.yml
new file mode 100644
index 00000000..4c08a1bb
--- /dev/null
+++ b/inventory/group_vars/k8s-test-2019vm/main.yml
@@ -0,0 +1,31 @@
+---
+vm_host: sk-2019vm
+
+install:
+  host: "{{ vm_host }}"
+  mem: 1024
+  numcpu: 2
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: zfs
+        pool: storage
+        name: "{{ inventory_hostname }}"
+        size: 10g
+  interfaces:
+  - bridge: br-public
+    name: primary0
+  autostart: False
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    interface: primary0
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
+#    overlay: "{{ (hostvars[vm_host].vm_host.network.bridges.public.overlay.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
diff --git a/inventory/group_vars/k8s-test-atlas/main.yml b/inventory/group_vars/k8s-test-atlas/main.yml
new file mode 100644
index 00000000..9838513d
--- /dev/null
+++ b/inventory/group_vars/k8s-test-atlas/main.yml
@@ -0,0 +1,36 @@
+---
+apt_repo_provider: ffgraz
+
+vm_host: ch-atlas
+
+install:
+  host: "{{ vm_host }}"
+  mem: 1024
+  numcpu: 2
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: lvm
+        vg: "{{ hostvars[vm_host].host_name }}"
+        lv: "{{ inventory_hostname }}"
+        size: 10g
+  interfaces:
+  - bridge: br-public
+    name: primary0
+    mac: "{{ '52:54:00' | random_mac(seed=inventory_hostname + '-primary0') }}"
+  - bridge: br-k8stest
+    name: direct0
+    mac: "{{ '52:54:00' | random_mac(seed=inventory_hostname + '-direct0') }}"
+  autostart: True
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    interface: primary0
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.gateway }}"
diff --git a/inventory/group_vars/k8s-test/main.yml b/inventory/group_vars/k8s-test/main.yml
index 7e5cbe2e..60d381ec 100644
--- a/inventory/group_vars/k8s-test/main.yml
+++ b/inventory/group_vars/k8s-test/main.yml
@@ -1,2 +1,49 @@
 ---
-zsh_banner: chaos-at-home
+containerd_lvm:
+  vg: "{{ host_name }}"
+  lv: containerd
+  size: 4G
+  fs: ext4
+
+kubernetes_version: 1.17.1
+kubernetes_container_runtime: containerd
+kubernetes_network_plugin: kubeguard
+kubernetes_cri_socket: "unix:///run/containerd/containerd.sock"
+
+kubernetes:
+  cluster_name: k8s-test
+
+  dedicated_master: False
+  api_extra_sans:
+  - 89.106.215.23
+  - k8s-test.spreadspace.org
+
+  pod_ip_range: 172.18.0.0/16
+  pod_ip_range_size: 24
+  service_ip_range: 172.18.192.0/18
+
+# kubernetes_secrets:
+#   encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}"
+
+
+kubeguard:
+  ## node_index must be in the range between 1 and 190 -> 189 hosts possible
+  ##
+  ## hardcoded hostnames are not nice but if we do this via host_vars
+  ## the info is spread over multiple files and this makes it more diffcult
+  ## to find mistakes, so it is nicer to keep it in one place...
+  node_index:
+    s2-k8s-test0: 1
+    s2-k8s-test1: 2
+    s2-k8s-test2: 3
+    s2-k8s-test3: 4
+    s2-k8s-test4: 5
+
+  direct_net_zones:
+    atlas:
+      transfer_net: 172.18.191.0/24
+      node_interface:
+        s2-k8s-test0: direct0
+        s2-k8s-test1: direct0
+
+kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index e4acf4da..e9771732 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -15,4 +15,7 @@ vm_host:
         offsets:
           ch-keyserver: 3
           ch-testvm: 4
+          s2-k8s-test0: 7
+          s2-k8s-test1: 8
           r3-vex2: 11
+      k8stest: {}
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 5740b206..51dcf1a0 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -28,3 +28,14 @@ docker_lvm:
   lv: docker
   size: 10G
   fs: ext4
+
+kubelet_lvm:
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 5G
+  fs: ext4
+
+kubernetes_version: 1.17.2
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 42
+kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index b2061380..37f9c97d 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -21,6 +21,9 @@ vm_host:
       public:
         prefix: 192.168.250.254/24
         offsets:
+          s2-k8s-test2: 1
+          s2-k8s-test3: 2
+          s2-k8s-test4: 3
           sk-torrent: 136
           ch-mimas: 143
           sk-testvm: 253
@@ -29,6 +32,7 @@ vm_host:
           prefix: 178.63.180.136/29
           offsets:
             sk-torrent: 0
+            s2-k8s-test4: 3
             ch-mimas: 6
             sk-testvm: 7
 
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index f6b39010..88a2d2b1 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -92,6 +92,23 @@ s2-thetys host_name=thetys
 s2-dione host_name=dione
 s2-helene host_name=helene
 
+[spreadspace:children]
+k8s-test
+
+
+[k8s-test-atlas]
+s2-k8s-test0 host_name=k8s-test0
+s2-k8s-test1 host_name=k8s-test1
+
+[k8s-test-2019vm]
+s2-k8s-test2 host_name=k8s-test2
+s2-k8s-test3 host_name=k8s-test3
+s2-k8s-test4 host_name=k8s-test4
+
+[k8s-test:children]
+k8s-test-atlas
+k8s-test-2019vm
+
 
 [emc:vars]
 host_domain=elev8.at
@@ -215,6 +232,7 @@ r3-cccamp19-av
 sk-testvm
 sk-torrent
 ch-mimas
+s2-k8s-test[0:4]
 
 
 [hroot]