From 5aec9db29770deb0491eaf7272b373ffdbc4275f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 23 Apr 2020 00:09:53 +0200 Subject: remove spreadspace k8s-test cluster --- inventory/group_vars/k8s-test-2019vm/main.yml | 31 ----------------- inventory/group_vars/k8s-test-atlas/main.yml | 36 ------------------- inventory/group_vars/k8s-test/main.yml | 50 --------------------------- inventory/host_vars/ch-atlas.yml | 2 -- inventory/host_vars/sk-2019vm.yml | 3 -- inventory/hosts.ini | 19 +--------- spreadspace/group_vars/k8s-test.yml | 10 ------ spreadspace/k8s-test.yml | 26 -------------- spreadspace/s2-k8s-test0.yml | 7 ---- spreadspace/s2-k8s-test1.yml | 7 ---- spreadspace/s2-k8s-test2.yml | 7 ---- spreadspace/s2-k8s-test3.yml | 7 ---- spreadspace/s2-k8s-test4.yml | 7 ---- 13 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 inventory/group_vars/k8s-test-2019vm/main.yml delete mode 100644 inventory/group_vars/k8s-test-atlas/main.yml delete mode 100644 inventory/group_vars/k8s-test/main.yml delete mode 100644 spreadspace/group_vars/k8s-test.yml delete mode 100644 spreadspace/k8s-test.yml delete mode 100644 spreadspace/s2-k8s-test0.yml delete mode 100644 spreadspace/s2-k8s-test1.yml delete mode 100644 spreadspace/s2-k8s-test2.yml delete mode 100644 spreadspace/s2-k8s-test3.yml delete mode 100644 spreadspace/s2-k8s-test4.yml diff --git a/inventory/group_vars/k8s-test-2019vm/main.yml b/inventory/group_vars/k8s-test-2019vm/main.yml deleted file mode 100644 index 4c08a1bb..00000000 --- a/inventory/group_vars/k8s-test-2019vm/main.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -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 deleted file mode 100644 index 9838513d..00000000 --- a/inventory/group_vars/k8s-test-atlas/main.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -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 deleted file mode 100644 index e67039df..00000000 --- a/inventory/group_vars/k8s-test/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -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 f86af753..ea8ba310 100644 --- a/inventory/host_vars/ch-atlas.yml +++ b/inventory/host_vars/ch-atlas.yml @@ -16,8 +16,6 @@ vm_host: ch-keyserver: 3 ch-testvm: 4 ele-mur: 5 - s2-k8s-test0: 7 - s2-k8s-test1: 8 r3-vex2: 11 k8stest: {} funkfeuer: diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index d9ac8c56..99614153 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -21,9 +21,6 @@ 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 emc-master: 137 ele-gwhetzner: 138 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index a53fb68e..2be67e06 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -90,23 +90,6 @@ 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 - ############################### # environment: dan @@ -198,6 +181,7 @@ emc-00 emc-dist0 emc-0[1:3] + ############################### # host categories @@ -235,7 +219,6 @@ r3-cccamp19-av sk-testvm sk-torrent ch-mimas -s2-k8s-test[0:4] ele-gwhetzner ele-mur diff --git a/spreadspace/group_vars/k8s-test.yml b/spreadspace/group_vars/k8s-test.yml deleted file mode 100644 index 389020c4..00000000 --- a/spreadspace/group_vars/k8s-test.yml +++ /dev/null @@ -1,10 +0,0 @@ -$ANSIBLE_VAULT;1.2;AES256;spreadspace -39376666393934306161383231356136393664373164653834393534623766323637666632313632 -3062623430363230333736643164393064346431346534650a393062613232663264383537396663 -39363838303361353766616264643139373062313437383332656162393536646262363561356264 -3333376139663332340a333036303333356333376630656632303464356261643731356336373337 -37303939363239613130363232646262353238333237633766613035643238356636323563636231 -66336562313963323536623732396534313131373338353136623461663033313534636561356131 -65373264636562336261316231656362333630656334373135633663666465376430303135383562 -33653663653132633834626165383832323235323563323334643830643934346466343762613433 -3463 diff --git a/spreadspace/k8s-test.yml b/spreadspace/k8s-test.yml deleted file mode 100644 index 9c06dbae..00000000 --- a/spreadspace/k8s-test.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: Basic Node Setup - hosts: k8s-test - roles: - - role: base - - role: sshd - - role: zsh - -- import_playbook: ../common/kubernetes-cluster-layout.yml - vars: - kubernetes_cluster_layout: - nodes_group: k8s-test - masters: - - s2-k8s-test0 - -### hack hack hack... -- name: cook kubernetes secrets - hosts: _kubernetes_masters_ - gather_facts: no - tasks: - - set_fact: - kubernetes_secrets_cooked: "{{ kubernetes_secrets }}" - external_ip_cooked: "{{ external_ip }}" - -- import_playbook: ../common/kubernetes.yml -- import_playbook: ../common/kubernetes-cleanup.yml diff --git a/spreadspace/s2-k8s-test0.yml b/spreadspace/s2-k8s-test0.yml deleted file mode 100644 index 50b75938..00000000 --- a/spreadspace/s2-k8s-test0.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-k8s-test0 - roles: - - role: base - - role: sshd - - role: zsh diff --git a/spreadspace/s2-k8s-test1.yml b/spreadspace/s2-k8s-test1.yml deleted file mode 100644 index 6050d269..00000000 --- a/spreadspace/s2-k8s-test1.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-k8s-test1 - roles: - - role: base - - role: sshd - - role: zsh diff --git a/spreadspace/s2-k8s-test2.yml b/spreadspace/s2-k8s-test2.yml deleted file mode 100644 index 87440a81..00000000 --- a/spreadspace/s2-k8s-test2.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-k8s-test2 - roles: - - role: base - - role: sshd - - role: zsh diff --git a/spreadspace/s2-k8s-test3.yml b/spreadspace/s2-k8s-test3.yml deleted file mode 100644 index 5c94db94..00000000 --- a/spreadspace/s2-k8s-test3.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-k8s-test3 - roles: - - role: base - - role: sshd - - role: zsh diff --git a/spreadspace/s2-k8s-test4.yml b/spreadspace/s2-k8s-test4.yml deleted file mode 100644 index 5cf93983..00000000 --- a/spreadspace/s2-k8s-test4.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: s2-k8s-test4 - roles: - - role: base - - role: sshd - - role: zsh -- cgit v1.2.3