diff options
Diffstat (limited to 'inventory')
34 files changed, 89 insertions, 438 deletions
diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index df2ac782..eb0576fd 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -12,6 +12,7 @@ prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" spreadspace_apt_repo_components: - main - prometheus + - container containerd_storage: diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml index 60450f88..93678de5 100644 --- a/inventory/group_vars/k8s-chtest/vars.yml +++ b/inventory/group_vars/k8s-chtest/vars.yml @@ -1,7 +1,7 @@ --- docker_pkg_provider: docker-com -kubernetes_version: 1.20.2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_network_plugin: kubeguard # kubernetes_network_plugin_variant: with-kube-router @@ -45,4 +45,4 @@ kubeguard: kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}" -kubernetes_metrics_server_version: 0.4.1 +kubernetes_metrics_server_version: 0.5.0 diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index 234defd8..e2b82c8f 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,8 +1,7 @@ --- containerd_pkg_provider: docker-com -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: containerd kubernetes_network_plugin: kubeguard diff --git a/inventory/group_vars/k8s-lwl/vars.yml b/inventory/group_vars/k8s-lwl/vars.yml deleted file mode 100644 index cd375971..00000000 --- a/inventory/group_vars/k8s-lwl/vars.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -docker_pkg_provider: docker-com - -kubernetes_version: 1.17.5 -kubernetes_container_runtime: docker -kubernetes_network_plugin: kubeguard - -kubernetes: - cluster_name: lndwrbl-live - - dedicated_master: False - api_extra_sans: - - 178.63.180.137 - - k8s-master.lndwrbl.live - - 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: - lw-live-01: 1 - lw-live-02: 2 - lw-live-03: 3 - lw-live-00: 100 - lw-live-dist0: 110 - lw-dione: 111 - lw-helene: 112 - lw-master: 127 - - direct_net_zones: - encoder: - transfer_net: 172.18.191.0/24 - node_interface: - lw-dione: eno2 - lw-helene: eno2 - -kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}" - -kubernetes_metrics_server_version: 0.3.7 diff --git a/inventory/group_vars/lendwirbel-live-xx/vars.yml b/inventory/group_vars/lendwirbel-live-xx/vars.yml deleted file mode 100644 index 6defdb17..00000000 --- a/inventory/group_vars/lendwirbel-live-xx/vars.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -install_playbook: lendwirbel-live-xx diff --git a/inventory/group_vars/lendwirbel-live/vars.yml b/inventory/group_vars/lendwirbel-live/vars.yml deleted file mode 100644 index a06be375..00000000 --- a/inventory/group_vars/lendwirbel-live/vars.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -zsh_banner: lendwirbel - -acmetool_account_email: equinox@spreadspace.org -acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" - -apt_repo_blackmagic_auth: - username: "spreadspace" - password: "{{ vault_apt_repo_blackmagic_auth.password }}" - -install: - cloud: - credentials: - token: "{{ vault_hcloud_api_token }}" - - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 93a94476..a4e95d44 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -41,6 +41,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + admin_users_host: - equinox @@ -80,8 +83,7 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: containerd kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index 08c750ef..2d68ed11 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -41,6 +41,10 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + + admin_users_host: - equinox @@ -74,9 +78,7 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes - -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: containerd kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ch-k8s-master.yml b/inventory/host_vars/ch-k8s-master.yml index 6e353684..71795c5d 100644 --- a/inventory/host_vars/ch-k8s-master.yml +++ b/inventory/host_vars/ch-k8s-master.yml @@ -51,6 +51,10 @@ network: - *_network_primary_ +spreadspace_apt_repo_components: + - container + + docker_storage: type: lvm vg: "{{ host_name }}" diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 0c4e13fb..b38b3929 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -25,6 +25,8 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes @@ -46,7 +48,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml index 87d04db2..4288bc15 100644 --- a/inventory/host_vars/ele-coturn.yml +++ b/inventory/host_vars/ele-coturn.yml @@ -20,10 +20,13 @@ kubelet_storage: fs: ext4 +spreadspace_apt_repo_components: + - container + acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" -kubernetes_version: 1.21.2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 17c6c0bf..37523b61 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -27,6 +27,7 @@ apt_repo_components: spreadspace_apt_repo_components: - main - prometheus + - container base_packages_extra_host: diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index 7c0e8a8b..21d7eb5a 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -27,6 +27,7 @@ apt_repo_components: spreadspace_apt_repo_components: - main - prometheus + - container base_packages_extra_host: diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml index c36d7eba..c2c6d305 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -20,6 +20,9 @@ kubelet_storage: fs: ext4 +spreadspace_apt_repo_components: + - container + ssh_users_root: - equinox - datacop @@ -27,7 +30,7 @@ ssh_users_root: acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" -kubernetes_version: 1.21.2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 115b2bd8..4db87e7c 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -43,6 +43,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + lvm_groups: storage: @@ -53,6 +56,7 @@ lvm_groups: blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes + docker_pkg_provider: docker-com docker_storage: @@ -69,8 +73,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.3 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index 2bdbd354..42a9d7d8 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -41,6 +41,8 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container zfs_arc_size: min: 1GB @@ -71,7 +73,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-coturn.yml b/inventory/host_vars/glt-coturn.yml index 9cff4891..108ecca7 100644 --- a/inventory/host_vars/glt-coturn.yml +++ b/inventory/host_vars/glt-coturn.yml @@ -13,7 +13,11 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 + +spreadspace_apt_repo_components: + - container + +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index fab997bc..c55b81b5 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -41,6 +41,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes @@ -61,7 +64,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index f3bc6263..1f9eead6 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -41,6 +41,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes @@ -61,7 +64,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml index 966f3a74..c9ead024 100644 --- a/inventory/host_vars/glt-jitsi.yml +++ b/inventory/host_vars/glt-jitsi.yml @@ -13,7 +13,12 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 + +spreadspace_apt_repo_components: + - container + + +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index b97b1a83..7b979511 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -41,6 +41,8 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container zfs_arc_size: min: 1GB @@ -71,7 +73,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index c2c3878c..dbe2e76a 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -40,6 +40,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + lvm_groups: storage: @@ -66,7 +69,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index 2d40a418..ddbebc24 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -40,6 +40,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + lvm_groups: storage: @@ -66,7 +69,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml deleted file mode 100644 index e5073987..00000000 --- a/inventory/host_vars/lw-dione.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -install: - efi: true - disks: - primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 - kernel_cmdline: - - "consoleblank=0" - - "nomodeset" - -network: - nameservers: - - 9.9.9.9 - domain: "{{ host_domain }}" - primary: &_network_primary_ - name: eno1 - address: 192.168.32.202/24 - gateway: 192.168.32.254 - interfaces: - - *_network_primary_ - - -base_packages_extra_host: - - exfat-fuse - - exfat-utils - - vlan - -admin_users_host: - - equinox - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 - - -ntp_variant: chrony - -ntp_client: - pools: - - name: at.pool.ntp.org - options: iburst - -ntp_hwtimestamp_interfaces: - - name: "*" - -ntp_server: - allow: - - "192.168.32.0/24" diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml deleted file mode 100644 index a45f02d0..00000000 --- a/inventory/host_vars/lw-helene.yml +++ /dev/null @@ -1,51 +0,0 @@ ---- -install: - efi: true - disks: - primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 - kernel_cmdline: - - "consoleblank=0" - - "nomodeset" - -network: - nameservers: - - 9.9.9.9 - domain: "{{ host_domain }}" - primary: &_network_primary_ - name: eno1 - address: 192.168.32.203/24 - gateway: 192.168.32.254 - interfaces: - - *_network_primary_ - - -base_packages_extra_host: - - exfat-fuse - - exfat-utils - - vlan - -admin_users_host: - - equinox - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 - - -ntp_client: - servers: - - name: "192.168.32.202" - options: iburst minpoll 1 maxpoll 3 polltarget 30 - -ntp_hwtimestamp_interfaces: - - name: "*" diff --git a/inventory/host_vars/lw-master.yml b/inventory/host_vars/lw-master.yml deleted file mode 100644 index cee52198..00000000 --- a/inventory/host_vars/lw-master.yml +++ /dev/null @@ -1,62 +0,0 @@ ---- -install: - vm: - memory: 10G - numcpus: 6 - autostart: True - disks: - primary: /dev/sda - scsi: - sda: - type: zfs - name: root - size: 20g - # sdb: - # type: blockdev - # path: /dev/zvol/storage/streamstats - interfaces: - - bridge: br-public - name: primary0 - -network: - nameservers: "{{ vm_host.network.dns }}" - domain: "{{ host_domain }}" - systemd_link: - interfaces: "{{ install.interfaces }}" - primary: &_network_primary_ - name: primary0 - address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}" - template: overlay - overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}" - interfaces: - - *_network_primary_ - -external_ip: "{{ network.primary.overlay }}" - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 7G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 5G - fs: ext4 - - -lvm_groups: - streamstats: - pvs: - - /dev/sdb - -emc_stats_storage: - type: lvm - vg: streamstats - lv: stats - size: 42G - fs: ext4 diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml deleted file mode 100644 index 8e9a0061..00000000 --- a/inventory/host_vars/lw-telesto.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -debian_preseed_language: de -debian_preseed_country: AT -debian_preseed_locales: - - de_AT.UTF-8 - - de_DE.UTF-8 - - en_US.UTF-8 - -debian_preseed_no_splash: no -debian_preseed_install_tasks: - - xubuntu-desktop - - -install: - efi: yes - disks: - primary: software-raid - raid: - level: 1 - members: - - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 - - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810 - system_lvm: - size: 50G - volumes: - - name: root - size: 20G - filesystem: ext4 - mountpoint: / - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec - -network: - nameservers: - - 9.9.9.9 - domain: "{{ host_domain }}" - primary: &_network_primary_ - name: eno1 - address: 192.168.32.201/24 - gateway: 192.168.32.254 - interfaces: - - *_network_primary_ - - -base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" - -admin_users_host: - - equinox diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml deleted file mode 100644 index 4dd48a27..00000000 --- a/inventory/host_vars/lw-thetys.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -install: - efi: true - disks: - primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161 - kernel_cmdline: - - "consoleblank=0" - -network: - nameservers: - - 9.9.9.9 - domain: "{{ host_domain }}" - primary: &_network_primary_ - name: eno1 - address: 192.168.28.202/24 - gateway: 192.168.28.254 - interfaces: - - *_network_primary_ - - -admin_users_host: - - equinox - -apt_repo_components: - - main - - contrib - - non-free ## for microcode updates - -docker_pkg_provider: docker-com - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 10G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 5G - fs: ext4 - -kubernetes_version: 1.21.1 -kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 -kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index e292d060..e827c5e7 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -28,6 +28,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + blackmagic_desktopvideo_version: 11.7a12 @@ -48,7 +51,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml index eec37447..ab4b91b1 100644 --- a/inventory/host_vars/sgg-icecast.yml +++ b/inventory/host_vars/sgg-icecast.yml @@ -32,6 +32,10 @@ network: external_ip: "{{ network.primary.overlay }}" +spreadspace_apt_repo_components: + - main + - container + nginx_server_names_hash_bucket_size: 64 @@ -51,8 +55,7 @@ kubelet_storage: size: 2G fs: ext4 -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml index 48a56f43..7fe81abd 100644 --- a/inventory/host_vars/sk-cloudio/nextcloud.yml +++ b/inventory/host_vars/sk-cloudio/nextcloud.yml @@ -8,7 +8,7 @@ nextcloud_zfs: nextcloud_instances: wolke.elevate.at: # new: true - version: 22.2.3 + version: 23.0.0 port: 8100 hostnames: - wolke.elevate.at @@ -20,7 +20,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['wolke.elevate.at'] }}" insomnia.skillz.biz: # new: true - version: 22.2.3 + version: 23.0.0 port: 8101 hostnames: - insomnia.skillz.biz @@ -44,7 +44,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}" wae.elevate.at: # new: true - version: 22.2.3 + version: 23.0.0 port: 8104 hostnames: - wae.elevate.at diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index ed6c0126..e54e39d0 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -36,6 +36,10 @@ apt_repo_components: - contrib ## for zfs - non-free ## for microcode updates +spreadspace_apt_repo_components: + - main + - container + zfs_arc_size: min: 2GB @@ -80,7 +84,6 @@ kubelet_storage: quota: 20G kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index 16a49c95..6a99d4b0 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -59,6 +59,10 @@ apt_repo_components: - main - contrib ## for zfs +spreadspace_apt_repo_components: + - main + - container + zfs_arc_size: min: 2GB @@ -95,7 +99,6 @@ kubelet_storage: quota: 15G kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 15 kubernetes_standalone_pod_cidr: 192.168.255.0/24 @@ -124,7 +127,7 @@ nextcloud_zfs: nextcloud_instances: team.tomwaitz.eu: # new: true - version: 21.0.4 + version: 22.2.3 port: 8100 hostnames: - team.tomwaitz.eu diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 3b0bca43..c1947b08 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -126,31 +126,6 @@ s2-dione host_name=dione s2-helene host_name=helene -[lendwirbel-live:vars] -host_domain=lndwrbl.live -env_group=spreadspace - -[lendwirbel-live] -lw-thetys host_name=thetys -lw-telesto host_name=telesto -lw-dione host_name=dione -lw-helene host_name=helene -lw-master - -[lendwirbel-live:children] -lendwirbel-live-dist -lendwirbel-live-xx - -[lendwirbel-live-dist] -lw-live-dist0 host_name=cdn-dist0 - -[lendwirbel-live-xx] -lw-live-00 host_name=cdn-00 -lw-live-01 host_name=cdn-01 -lw-live-02 host_name=cdn-02 -lw-live-03 host_name=cdn-03 - - [schlagergarten-gloria:vars] host_domain=schlagergartengloria.at env_group=spreadspace @@ -330,7 +305,6 @@ ch-pan ch-mimas ch-mimas2 s2-build -lw-master sk-2019 sk-2019vm sk-tomnext @@ -388,7 +362,6 @@ sk-torrent ch-mimas ele-gwhetzner emc-master -lw-master sgg-icecast [vmhost-sk-2019vm] sk-2019vm @@ -486,12 +459,9 @@ glt-stream [hcloud:children] emc-dist emc-xx -lendwirbel-live-dist -lendwirbel-live-xx [hetzner] emc-master -lw-master sk-testvm sk-torrent sgg-icecast @@ -531,7 +501,6 @@ k8s-emc ## Kubernetes [kubernetes-cluster:children] k8s-emc -k8s-lwl k8s-chtest [standalone-kubelet] @@ -539,7 +508,6 @@ sk-cloudio ele-thetys ele-coturn ele-jitsi -lw-thetys s2-thetys sk-tomnext-nc ch-thetys @@ -552,7 +520,6 @@ glt-telesto glt-tsdatacop glt-thetys sgg-icecast -ch-testvm-prometheus [kubernetes:children] kubernetes-cluster @@ -581,27 +548,6 @@ k8s-emc-distribution k8s-emc-streamer -### Kubernetes Cluster: lendwirbel-live -[k8s-lwl-encoder] -lw-dione -lw-helene - -[k8s-lwl-distribution:children] -lendwirbel-live-dist - -[k8s-lwl-streamer:children] -lendwirbel-live-xx - -[k8s-lwl-master] -lw-master - -[k8s-lwl:children] -k8s-lwl-master -k8s-lwl-encoder -k8s-lwl-distribution -k8s-lwl-streamer - - ### Kubernetes Cluster: chtest [k8s-chtest-encoder] ch-dione |