diff options
52 files changed, 173 insertions, 98 deletions
diff --git a/inventory/group_vars/k8s-lwl/vars.yml b/_graveyard_/inventory/group_vars/k8s-lwl/vars.yml index cd375971..6a93d86b 100644 --- a/inventory/group_vars/k8s-lwl/vars.yml +++ b/_graveyard_/inventory/group_vars/k8s-lwl/vars.yml @@ -1,7 +1,7 @@ --- docker_pkg_provider: docker-com -kubernetes_version: 1.17.5 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_network_plugin: kubeguard @@ -47,4 +47,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.3.7 +kubernetes_metrics_server_version: 0.5.0 diff --git a/inventory/group_vars/lendwirbel-live-xx/vars.yml b/_graveyard_/inventory/group_vars/lendwirbel-live-xx/vars.yml index 6defdb17..6defdb17 100644 --- a/inventory/group_vars/lendwirbel-live-xx/vars.yml +++ b/_graveyard_/inventory/group_vars/lendwirbel-live-xx/vars.yml diff --git a/inventory/group_vars/lendwirbel-live/vars.yml b/_graveyard_/inventory/group_vars/lendwirbel-live/vars.yml index a06be375..a06be375 100644 --- a/inventory/group_vars/lendwirbel-live/vars.yml +++ b/_graveyard_/inventory/group_vars/lendwirbel-live/vars.yml diff --git a/inventory/host_vars/lw-dione.yml b/_graveyard_/inventory/host_vars/lw-dione.yml index e5073987..e5073987 100644 --- a/inventory/host_vars/lw-dione.yml +++ b/_graveyard_/inventory/host_vars/lw-dione.yml diff --git a/inventory/host_vars/lw-helene.yml b/_graveyard_/inventory/host_vars/lw-helene.yml index a45f02d0..a45f02d0 100644 --- a/inventory/host_vars/lw-helene.yml +++ b/_graveyard_/inventory/host_vars/lw-helene.yml diff --git a/inventory/host_vars/lw-master.yml b/_graveyard_/inventory/host_vars/lw-master.yml index cee52198..cee52198 100644 --- a/inventory/host_vars/lw-master.yml +++ b/_graveyard_/inventory/host_vars/lw-master.yml diff --git a/inventory/host_vars/lw-telesto.yml b/_graveyard_/inventory/host_vars/lw-telesto.yml index 8e9a0061..8e9a0061 100644 --- a/inventory/host_vars/lw-telesto.yml +++ b/_graveyard_/inventory/host_vars/lw-telesto.yml diff --git a/inventory/host_vars/lw-thetys.yml b/_graveyard_/inventory/host_vars/lw-thetys.yml index 4dd48a27..a732782d 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/_graveyard_/inventory/host_vars/lw-thetys.yml @@ -26,6 +26,10 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + + docker_pkg_provider: docker-com docker_storage: @@ -42,7 +46,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/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini index bc1fafdb..2b79221f 100644 --- a/_graveyard_/inventory/hosts.ini +++ b/_graveyard_/inventory/hosts.ini @@ -22,6 +22,36 @@ r3-cccamp19-feedcode host_name=feedcode r3-cccamp19-av host_name=av + +############################### +# environment: spreadspace + +[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 + + + ############################### # environment: dan @@ -64,3 +94,36 @@ vmhost-ch-gnocchi-guests [dolmetsch-ctl:children] ele-dolmetsch-ctl + +[hetzner] +lw-master + +[hcloud:children] +lendwirbel-live-dist +lendwirbel-live-xx + +[kubernetes-cluster:children] +k8s-lwl + +[standalone-kubelet] +lw-thetys + +### 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 diff --git a/spreadspace/group_vars/k8s-lwl.yml b/_graveyard_/spreadspace/group_vars/k8s-lwl.yml index 5fc69d0a..5fc69d0a 100644 --- a/spreadspace/group_vars/k8s-lwl.yml +++ b/_graveyard_/spreadspace/group_vars/k8s-lwl.yml diff --git a/spreadspace/group_vars/lendwirbel-live.yml b/_graveyard_/spreadspace/group_vars/lendwirbel-live.yml index f35f6a2f..f35f6a2f 100644 --- a/spreadspace/group_vars/lendwirbel-live.yml +++ b/_graveyard_/spreadspace/group_vars/lendwirbel-live.yml diff --git a/spreadspace/k8s-lwl.yml b/_graveyard_/spreadspace/k8s-lwl.yml index 1aa09daa..1aa09daa 100644 --- a/spreadspace/k8s-lwl.yml +++ b/_graveyard_/spreadspace/k8s-lwl.yml diff --git a/spreadspace/lendwirbel-live-xx.yml b/_graveyard_/spreadspace/lendwirbel-live-xx.yml index 82a45785..82a45785 100644 --- a/spreadspace/lendwirbel-live-xx.yml +++ b/_graveyard_/spreadspace/lendwirbel-live-xx.yml diff --git a/spreadspace/lw-dione.yml b/_graveyard_/spreadspace/lw-dione.yml index af214d7f..af214d7f 100644 --- a/spreadspace/lw-dione.yml +++ b/_graveyard_/spreadspace/lw-dione.yml diff --git a/spreadspace/lw-helene.yml b/_graveyard_/spreadspace/lw-helene.yml index a9466c66..a9466c66 100644 --- a/spreadspace/lw-helene.yml +++ b/_graveyard_/spreadspace/lw-helene.yml diff --git a/spreadspace/lw-master.yml b/_graveyard_/spreadspace/lw-master.yml index 0f6f9390..0f6f9390 100644 --- a/spreadspace/lw-master.yml +++ b/_graveyard_/spreadspace/lw-master.yml diff --git a/spreadspace/lw-telesto.yml b/_graveyard_/spreadspace/lw-telesto.yml index ddac511b..ddac511b 100644 --- a/spreadspace/lw-telesto.yml +++ b/_graveyard_/spreadspace/lw-telesto.yml diff --git a/spreadspace/lw-thetys.yml b/_graveyard_/spreadspace/lw-thetys.yml index f32496af..f32496af 100644 --- a/spreadspace/lw-thetys.yml +++ b/_graveyard_/spreadspace/lw-thetys.yml diff --git a/common/kubernetes-cluster.yml b/common/kubernetes-cluster.yml index fe26d90d..4ee91dd3 100644 --- a/common/kubernetes-cluster.yml +++ b/common/kubernetes-cluster.yml @@ -36,6 +36,7 @@ - name: kubernetes base installation hosts: _kubernetes_nodes_ roles: + - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/kubeadm/base diff --git a/dan/ele-coturn.yml b/dan/ele-coturn.yml index 7e7edaa1..dcb8b417 100644 --- a/dan/ele-coturn.yml +++ b/dan/ele-coturn.yml @@ -7,9 +7,9 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/standalone/base - - role: apt-repo/spreadspace - role: acmetool/base - role: apps/coturn - role: apps/mumble diff --git a/dan/ele-jitsi.yml b/dan/ele-jitsi.yml index f5213032..2e63f558 100644 --- a/dan/ele-jitsi.yml +++ b/dan/ele-jitsi.yml @@ -7,9 +7,9 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/standalone/base - - role: apt-repo/spreadspace - role: acmetool/base - role: nginx/base - role: apps/jitsi/meet 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/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/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 diff --git a/roles/kubernetes/base/defaults/main.yml b/roles/kubernetes/base/defaults/main.yml index d5eccc59..9e97a8fb 100644 --- a/roles/kubernetes/base/defaults/main.yml +++ b/roles/kubernetes/base/defaults/main.yml @@ -1,2 +1,2 @@ --- -kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0~1" +kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0-1" diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index b457dd68..4ff976a1 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -1,4 +1,11 @@ --- +- name: check if prometheus apt component of spreadspace repo is enabled + assert: + msg: "please enable the 'container' component of spreadspace repo using 'spreadspace_apt_repo_components'" + that: + - spreadspace_apt_repo_components is defined + - "'container' in spreadspace_apt_repo_components" + - name: install container runtime include_tasks: "cri_{{ kubernetes_container_runtime }}.yml" @@ -13,10 +20,6 @@ include_role: name: apt-repo/kubernetes -- name: add apt repository for cri-tools - include_role: - name: apt-repo/kubic-project - - name: generate apt pin files for kubelet and cri-tools loop: - name: kubelet diff --git a/spreadspace/glt-coturn.yml b/spreadspace/glt-coturn.yml index f0b4b1d2..b3fbcacf 100644 --- a/spreadspace/glt-coturn.yml +++ b/spreadspace/glt-coturn.yml @@ -7,9 +7,9 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/standalone/base - - role: apt-repo/spreadspace - role: acmetool/base - role: apps/coturn - role: apps/mumble diff --git a/spreadspace/glt-jitsi.yml b/spreadspace/glt-jitsi.yml index 1721b1c6..2faeb036 100644 --- a/spreadspace/glt-jitsi.yml +++ b/spreadspace/glt-jitsi.yml @@ -7,9 +7,9 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/standalone/base - - role: apt-repo/spreadspace - role: acmetool/base - role: nginx/base - role: apps/jitsi/meet diff --git a/spreadspace/sgg-icecast.yml b/spreadspace/sgg-icecast.yml index c7ade2af..8d5b02fa 100644 --- a/spreadspace/sgg-icecast.yml +++ b/spreadspace/sgg-icecast.yml @@ -7,10 +7,10 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp + - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/standalone/base - role: streaming/icecast - - role: apt-repo/spreadspace - role: acmetool/base - role: nginx/base - name: storage/lvm/volume |