diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-05-08 02:19:02 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-05-08 02:19:02 +0200 |
commit | 382f294e9b1dbcc2cb298d6a0cc80234dffcab82 (patch) | |
tree | c4339e341070ef5b2012fd8a9cced42217decd62 /inventory | |
parent | prepare ch-dione and ch-helene for chtest k8s cluster (diff) | |
parent | kubernetes/kubeadm: fix kubeguard network plugin (diff) |
Merge branch 'topic/k8s-1.24'
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/k8s-chtest/vars.yml | 8 | ||||
-rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 10 | ||||
-rw-r--r-- | inventory/group_vars/vmhost-sk-2019vm/vars.yml | 6 | ||||
-rw-r--r-- | inventory/host_vars/ch-dione.yml | 33 | ||||
-rw-r--r-- | inventory/host_vars/ch-helene.yml | 33 | ||||
-rw-r--r-- | inventory/host_vars/ch-k8s-ctrl.yml (renamed from inventory/host_vars/ch-k8s-master.yml) | 0 | ||||
-rw-r--r-- | inventory/host_vars/emc-ctrl.yml (renamed from inventory/host_vars/emc-master.yml) | 0 | ||||
-rw-r--r-- | inventory/hosts.ini | 22 |
9 files changed, 63 insertions, 51 deletions
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 2957a24a..46564977 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -68,7 +68,7 @@ network_zones: ch-http-proxy: 8 ch-imap-proxy: 9 ch-vpn: 10 - ch-k8s-master: 20 + ch-k8s-ctrl: 20 ch-jump: 22 ch-gw-lan: 28 ch-iot: 30 diff --git a/inventory/group_vars/k8s-chtest/vars.yml b/inventory/group_vars/k8s-chtest/vars.yml index e01b996d..ac1a3991 100644 --- a/inventory/group_vars/k8s-chtest/vars.yml +++ b/inventory/group_vars/k8s-chtest/vars.yml @@ -1,15 +1,15 @@ --- -kubernetes_version: 1.23.1 +kubernetes_version: 1.24.0 kubernetes_container_runtime: containerd kubernetes_network_plugin: kube-router kubernetes_network_plugin_version: 1.4.0 -kubernetes_network_plugin_replaces_kube_proxy: true +kubernetes_network_plugin_replaces_kube_proxy: yes kubernetes: cluster_name: chtest - dedicated_master: True + dedicated_controlplane_nodes: yes api_extra_sans: - 192.168.32.20 @@ -21,4 +21,4 @@ kubernetes: kubernetes_secrets: encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}" -kubernetes_metrics_server_version: 0.5.2 +kubernetes_metrics_server_version: 0.6.1 diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index c13e610c..be1c4818 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,15 +1,15 @@ --- -kubernetes_version: 1.23.1 +kubernetes_version: 1.24.0 kubernetes_container_runtime: containerd kubernetes_network_plugin: kubeguard kubernetes: cluster_name: emc - dedicated_master: False + dedicated_controlplane_nodes: yes api_extra_sans: - 178.63.180.137 - - emc-master.elev8.at + - emc-ctrl.elev8.at pod_ip_range: 172.18.0.0/16 pod_ip_range_size: 24 @@ -37,7 +37,7 @@ kubeguard: emc-dist0: 110 ele-dione: 111 ele-helene: 112 - emc-master: 127 + emc-ctrl: 127 direct_net_zones: encoder: @@ -48,4 +48,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.5.2 +kubernetes_metrics_server_version: 0.6.1 diff --git a/inventory/group_vars/vmhost-sk-2019vm/vars.yml b/inventory/group_vars/vmhost-sk-2019vm/vars.yml index 221fa581..41f8b9db 100644 --- a/inventory/group_vars/vmhost-sk-2019vm/vars.yml +++ b/inventory/group_vars/vmhost-sk-2019vm/vars.yml @@ -11,8 +11,7 @@ vm_host: prefix: 192.168.250.0/24 offsets: sk-torrent: 136 - emc-master: 137 -# lw-master: 137 + emc-ctrl: 137 ele-gwhetzner: 138 sgg-icecast: 141 ch-mimas: 142 @@ -24,8 +23,7 @@ vm_host: prefix: 178.63.180.136/29 offsets: sk-torrent: 0 - emc-master: 1 -# lw-master: 1 + emc-ctrl: 1 ele-gwhetzner: 2 sgg-icecast: 5 ch-mimas: 6 diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index a3cbbe68..ef9d8657 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -48,11 +48,18 @@ blackmagic_desktopvideo_version: 12.2.2a6 blackmagic_desktopvideo_include_gui: yes -docker_pkg_provider: docker-com -docker_storage: +# docker_pkg_provider: docker-com +# docker_storage: +# type: lvm +# vg: "{{ host_name }}" +# lv: docker +# size: 10G +# fs: ext4 + +containerd_storage: type: lvm vg: "{{ host_name }}" - lv: docker + lv: containerd size: 10G fs: ext4 @@ -63,15 +70,15 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.24.0 -kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 -kubernetes_standalone_cni_variant: with-portmap +# kubernetes_version: 1.24.0 +# kubernetes_container_runtime: docker +# kubernetes_standalone_max_pods: 42 +# kubernetes_standalone_cni_variant: with-portmap -rtmp_streamer_base_path: /srv/storage/streamer -rtmp_streamer_inst_name: feed -rtmp_streamer_nginx_image_version: 2022-04-29.23 -rtmp_streamer_decklink_card: "DeckLink 8K Pro (1)" -rtmp_streamer_config: - input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i'] +# rtmp_streamer_base_path: /srv/storage/streamer +# rtmp_streamer_inst_name: feed +# rtmp_streamer_nginx_image_version: 2022-04-29.23 +# rtmp_streamer_decklink_card: "DeckLink 8K Pro (1)" +# rtmp_streamer_config: +# input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i'] diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index c524bf6a..816b38f8 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -48,11 +48,18 @@ blackmagic_desktopvideo_version: 12.2.2a6 blackmagic_desktopvideo_include_gui: yes -docker_pkg_provider: docker-com -docker_storage: +# docker_pkg_provider: docker-com +# docker_storage: +# type: lvm +# vg: "{{ host_name }}" +# lv: docker +# size: 10G +# fs: ext4 + +containerd_storage: type: lvm vg: "{{ host_name }}" - lv: docker + lv: containerd size: 10G fs: ext4 @@ -63,15 +70,15 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.24.0 -kubernetes_container_runtime: docker -kubernetes_standalone_max_pods: 42 -kubernetes_standalone_cni_variant: with-portmap +# kubernetes_version: 1.24.0 +# kubernetes_container_runtime: docker +# kubernetes_standalone_max_pods: 42 +# kubernetes_standalone_cni_variant: with-portmap -rtmp_streamer_base_path: /srv/storage/streamer -rtmp_streamer_inst_name: feed -rtmp_streamer_nginx_image_version: 2022-04-29.23 -rtmp_streamer_decklink_card: "DeckLink SDI 4K" -rtmp_streamer_config: - input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i'] +# rtmp_streamer_base_path: /srv/storage/streamer +# rtmp_streamer_inst_name: feed +# rtmp_streamer_nginx_image_version: 2022-04-29.23 +# rtmp_streamer_decklink_card: "DeckLink SDI 4K" +# rtmp_streamer_config: +# input_params: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp50', '-ac', '2', '-i'] diff --git a/inventory/host_vars/ch-k8s-master.yml b/inventory/host_vars/ch-k8s-ctrl.yml index 63723000..63723000 100644 --- a/inventory/host_vars/ch-k8s-master.yml +++ b/inventory/host_vars/ch-k8s-ctrl.yml diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-ctrl.yml index 1ca011ec..1ca011ec 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-ctrl.yml diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 74e37925..581913b6 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -51,7 +51,7 @@ ch-calypso host_name=calypso ch-thetys host_name=thetys ch-dione host_name=dione ch-helene host_name=helene -ch-k8s-master host_name=k8s-master +ch-k8s-ctrl host_name=k8s-ctrl ch-hpws-maxi ch-hpws-mini1 ch-alix1d @@ -246,7 +246,7 @@ host_domain=elev8.at env_group=dan [emc] -emc-master +emc-ctrl [emc:children] emc-dist @@ -342,7 +342,7 @@ ch-iot ch-vpn ch-mon ch-omd -ch-k8s-master +ch-k8s-ctrl ch-installsmb [vmhost-ch-prometheus] ch-prometheus @@ -364,7 +364,7 @@ sk-testvm sk-torrent ch-mimas ele-gwhetzner -emc-master +emc-ctrl sgg-icecast [vmhost-sk-2019vm] sk-2019vm @@ -468,7 +468,7 @@ emc-dist emc-xx [hetzner] -emc-master +emc-ctrl sk-testvm sk-torrent sgg-icecast @@ -548,11 +548,11 @@ emc-dist [k8s-emc-streamer:children] emc-xx -[k8s-emc-master] -emc-master +[k8s-emc-ctrl] +emc-ctrl [k8s-emc:children] -k8s-emc-master +k8s-emc-ctrl k8s-emc-encoder k8s-emc-distribution k8s-emc-streamer @@ -563,9 +563,9 @@ k8s-emc-streamer ch-dione ch-helene -[k8s-chtest-master] -ch-k8s-master +[k8s-chtest-ctrl] +ch-k8s-ctrl [k8s-chtest:children] -k8s-chtest-master +k8s-chtest-ctrl k8s-chtest-encoder |