diff options
| -rw-r--r-- | dan/k8s-emc.yml | 8 | ||||
| -rw-r--r-- | inventory/group_vars/k8s-emc/vars.yml | 4 | ||||
| -rw-r--r-- | roles/containerd/tasks/main.yml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml index ce4b9c9e..1a17744c 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -9,7 +9,7 @@ - role: core/ntp - role: apt-repo/spreadspace - role: nginx/base -# - role: monitoring/prometheus/exporter + - role: monitoring/prometheus/exporter - import_playbook: ../common/kubernetes-cluster-layout.yml vars: @@ -36,7 +36,7 @@ hosts: _kubernetes_nodes_ roles: - role: kubernetes/addons/metrics-server - - role: kubernetes/addons/openebs-zfs + #- role: kubernetes/addons/openebs-zfs - role: kubernetes/addons/cert-manager - - role: kubernetes/addons/node-feature-discovery - - role: kubernetes/addons/intel-gpu-device-plugin + #- role: kubernetes/addons/node-feature-discovery + #- role: kubernetes/addons/intel-gpu-device-plugin diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml index fedf8505..efab9a57 100644 --- a/inventory/group_vars/k8s-emc/vars.yml +++ b/inventory/group_vars/k8s-emc/vars.yml @@ -1,9 +1,9 @@ --- kubernetes_node_name: "{{ inventory_hostname | replace('ele-', '') }}" -kubernetes_version: 1.25.0 -kubernetes_cri_tools_pkg_version: 1.24.2-00 +kubernetes_version: 1.26.1 kubernetes_container_runtime: containerd +containerd_pkg_provider: docker-com kubernetes_network_plugin: kubeguard kubernetes: diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml index 5955d39e..8b5ab2f5 100644 --- a/roles/containerd/tasks/main.yml +++ b/roles/containerd/tasks/main.yml @@ -44,7 +44,7 @@ register: containerd_config_default changed_when: false -- name: fetch containerd default config +- name: generate containerd config copy: content: "{{ containerd_config_default.stdout | from_toml | combine(containerd_config, recursive=True) | to_toml }}\n" dest: /etc/containerd/config.toml |