diff options
author | Christian Pointner <equinox@spreadspace.org> | 2021-09-16 11:34:17 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2021-09-16 11:34:22 +0200 |
commit | 1de7cf083ba2a9c5217cdcc5c1cefcbdf08129b1 (patch) | |
tree | 1b19d0ce90658e9261ee278246be6b02bfbdc9ef /roles/kubernetes/kubeadm/master/tasks/primary-master.yml | |
parent | improve compatibility with more bioses for debian usb installer (diff) |
kubernetes/kubeadm: add support for 1.22
Diffstat (limited to 'roles/kubernetes/kubeadm/master/tasks/primary-master.yml')
-rw-r--r-- | roles/kubernetes/kubeadm/master/tasks/primary-master.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/kubernetes/kubeadm/master/tasks/primary-master.yml b/roles/kubernetes/kubeadm/master/tasks/primary-master.yml index 463821ff..6fb63d09 100644 --- a/roles/kubernetes/kubeadm/master/tasks/primary-master.yml +++ b/roles/kubernetes/kubeadm/master/tasks/primary-master.yml @@ -4,6 +4,7 @@ path: /etc/kubernetes/kubelet.conf register: kubeconfig_kubelet_stats + ## TODO: switch to kubeadm config version v1beta3 (available since 1.22) - name: generate kubeadm.config template: src: kubeadm.config.j2 @@ -27,8 +28,8 @@ - name: initialize kubernetes master and store log block: - name: initialize kubernetes master - command: "kubeadm init --config /etc/kubernetes/kubeadm.config --node-name {{ inventory_hostname }} --cri-socket {{ kubernetes_cri_socket }}{% if kubernetes_network_plugin_replaces_kube_proxy %} --skip-phases addon/kube-proxy{% endif %} --skip-token-print" - # command: "kubeadm init --config /etc/kubernetes/kubeadm.config --cri-socket {{ kubernetes_cri_socket }}{% if kubernetes_network_plugin_replaces_kube_proxy %} --skip-phases addon/kube-proxy{% endif %} --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" + command: "kubeadm init --config /etc/kubernetes/kubeadm.config --node-name {{ inventory_hostname }}{% if kubernetes_network_plugin_replaces_kube_proxy %} --skip-phases addon/kube-proxy{% endif %} --skip-token-print" + # command: "kubeadm init --config /etc/kubernetes/kubeadm.config --node-name {{ inventory_hostname }}{% if kubernetes_network_plugin_replaces_kube_proxy %} --skip-phases addon/kube-proxy{% endif %} --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" args: creates: /etc/kubernetes/pki/ca.crt register: kubeadm_init @@ -117,6 +118,7 @@ src: node-local-dns.yml.j2 dest: /etc/kubernetes/node-local-dns.yml + ## TODO: move to server-side apply (GA since 1.22) - name: install node-local dns cache command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/node-local-dns.yml register: kube_node_local_dns_apply_result |