diff --git a/ansible/inventories/kubernetes.yml b/ansible/inventories/kubernetes.yml index 5a18fb9..854468a 100644 --- a/ansible/inventories/kubernetes.yml +++ b/ansible/inventories/kubernetes.yml @@ -6,15 +6,15 @@ all: control_plane: hosts: controlplane: - ansible_host: 10.203.146.40 + ansible_host: 10.203.146.166 workers: hosts: node01: - ansible_host: 10.203.146.133 + ansible_host: 10.203.146.180 node02: - ansible_host: 10.203.146.11 + ansible_host: 10.203.146.62 node03: - ansible_host: 10.203.146.223 + ansible_host: 10.203.146.185 vars: ansible_user: ubuntu ansible_become: yes diff --git a/ansible/tasks/kubernetes/control-plane-init.yml b/ansible/tasks/kubernetes/control-plane-init.yml index beaf775..fc51016 100644 --- a/ansible/tasks/kubernetes/control-plane-init.yml +++ b/ansible/tasks/kubernetes/control-plane-init.yml @@ -76,11 +76,11 @@ register: node_ready changed_when: false -- name: Remove taint from control plane node - shell: kubectl --kubeconfig=/etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/control-plane- - register: taint_result - changed_when: "'untainted' in taint_result.stdout" - failed_when: false # This might fail if the taint doesn't exist, which is fine +# - name: Remove taint from control plane node +# shell: kubectl --kubeconfig=/etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/control-plane- +# register: taint_result +# changed_when: "'untainted' in taint_result.stdout" +# failed_when: false # This might fail if the taint doesn't exist, which is fine - name: Remove load balancer label from all nodes shell: kubectl --kubeconfig=/etc/kubernetes/admin.conf label nodes --all node.kubernetes.io/exclude-from-external-load-balancers- diff --git a/ansible/tasks/kubernetes/install-containerd.yml b/ansible/tasks/kubernetes/install-containerd.yml index 8cf6621..6525d9b 100644 --- a/ansible/tasks/kubernetes/install-containerd.yml +++ b/ansible/tasks/kubernetes/install-containerd.yml @@ -64,6 +64,15 @@ when: config_written.changed notify: Restart containerd +- name: Update containerd config for Kubernetes sandbox image + lineinfile: + path: "{{ containerd_config_root }}/config.toml" + regexp: '(\s*)sandbox_image = ".*"' + line: '\1sandbox_image = "registry.k8s.io/pause:3.10"' + backrefs: yes + when: config_written.changed + notify: Restart containerd + - name: Update containerd config for GRPC socket group (gid) replace: path: "{{ containerd_config_root }}/config.toml"