diff options
Diffstat (limited to 'roles')
-rw-r--r-- | roles/kubernetes/base/tasks/cri_containerd.yml | 1 | ||||
-rw-r--r-- | roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml | 2 | ||||
-rw-r--r-- | roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml index 97775b14..e13799b0 100644 --- a/roles/kubernetes/base/tasks/cri_containerd.yml +++ b/roles/kubernetes/base/tasks/cri_containerd.yml @@ -10,6 +10,7 @@ containerd_config_override: plugins: "io.containerd.grpc.v1.cri": + disable_apparmor: true containerd: runtimes: runc: diff --git a/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml b/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml index af609882..40cee3b7 100644 --- a/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml +++ b/roles/kubernetes/kubeadm/base/tasks/net_kubeguard.yml @@ -88,7 +88,7 @@ - name: install cni config template: src: net_kubeguard/cni.json.j2 - dest: /etc/cni/net.d/kubeguard.json + dest: /etc/cni/net.d/kubeguard.conf - name: install packages needed for debugging kube-router when: kubernetes_network_plugin_variant == 'with-kube-router' diff --git a/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 b/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 index 4b8548f7..e141492f 100644 --- a/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 +++ b/roles/kubernetes/kubeadm/master/templates/kubeadm.config.j2 @@ -48,3 +48,4 @@ apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration clusterDNS: - {{ kubernetes_nodelocal_dnscache_ip }} +cgroupDriver: systemd |