diff options
| -rw-r--r-- | common/kubernetes-cluster.yml | 1 | ||||
| -rw-r--r-- | dan/ele-coturn.yml | 2 | ||||
| -rw-r--r-- | dan/ele-jitsi.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/emc/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-chtest/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 3 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-lwl/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-k8s-master.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ele-dione.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ele-helene.yml | 1 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 | ||||
| -rw-r--r-- | spreadspace/glt-coturn.yml | 2 | ||||
| -rw-r--r-- | spreadspace/glt-jitsi.yml | 2 | ||||
| -rw-r--r-- | spreadspace/sgg-icecast.yml | 2 |
14 files changed, 18 insertions, 12 deletions
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/group_vars/k8s-lwl/vars.yml b/inventory/group_vars/k8s-lwl/vars.yml index cd375971..6a93d86b 100644 --- a/inventory/group_vars/k8s-lwl/vars.yml +++ b/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/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/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/hosts.ini b/inventory/hosts.ini index 3b0bca43..cf35b817 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -552,7 +552,6 @@ glt-telesto glt-tsdatacop glt-thetys sgg-icecast -ch-testvm-prometheus [kubernetes:children] kubernetes-cluster 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 |