C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix scale playbook (#6482)

Browse source
This commit is contained in:
Samuel Liu 2020-08-20 19:33:23 +08:00 committed by GitHub
parent bf6fdce339
commit a42d811420
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/kubernetes/kubeadm/handlers/main.yml
View file

@ -3,13 +3,13 @@
command: /bin/true command: /bin/true
notify: notify:
- Kubeadm | reload systemd - Kubeadm | reload systemd
- Kubeadm | reload kubelet - Kubeadm | restart kubelet
- name: Kubeadm | reload systemd - name: Kubeadm | reload systemd
systemd: systemd:
daemon_reload: true daemon_reload: true
- name: Kubeadm | reload kubelet - name: Kubeadm | restart kubelet
service: service:
name: kubelet name: kubelet
state: restarted state: restarted

23
scale.yml
View file

@ -30,7 +30,7 @@
gather_facts: false gather_facts: false
roles: roles:
- { role: kubespray-defaults } - { role: kubespray-defaults }
- { role: bootstrap-os, tags: bootstrap-os} - { role: bootstrap-os, tags: bootstrap-os }
- name: Gather facts - name: Gather facts
tags: always tags: always
@ -46,13 +46,14 @@
- name: Download images to ansible host cache via first kube-master node - name: Download images to ansible host cache via first kube-master node
hosts: kube-master[0] hosts: kube-master[0]
gather_facts: False
any_errors_fatal: "{{ any_errors_fatal | default(true) }}" any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
roles: roles:
- { role: kubespray-defaults, when: "not skip_downloads and download_run_once and not download_localhost"} - { role: kubespray-defaults, when: "not skip_downloads and download_run_once and not download_localhost" }
- { role: kubernetes/preinstall, tags: preinstall, when: "not skip_downloads and download_run_once and not download_localhost" } - { role: kubernetes/preinstall, tags: preinstall, when: "not skip_downloads and download_run_once and not download_localhost" }
- { role: download, tags: download, when: "not skip_downloads and download_run_once and not download_localhost" } - { role: download, tags: download, when: "not skip_downloads and download_run_once and not download_localhost" }
- name: Target only workers to get kubelet installed and checking in on any new nodes - name: Target only workers to get kubelet installed and checking in on any new nodes(engine)
hosts: kube-node hosts: kube-node
gather_facts: False gather_facts: False
any_errors_fatal: "{{ any_errors_fatal | default(true) }}" any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
@ -62,7 +63,23 @@
- { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) } - { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
- { role: download, tags: download, when: "not skip_downloads" } - { role: download, tags: download, when: "not skip_downloads" }
- { role: etcd, tags: etcd, etcd_cluster_setup: false, when: "not etcd_kubeadm_enabled|default(false)" } - { role: etcd, tags: etcd, etcd_cluster_setup: false, when: "not etcd_kubeadm_enabled|default(false)" }
environment: "{{ proxy_env }}"
- name: Target only workers to get kubelet installed and checking in on any new nodes(node)
hosts: kube-node
gather_facts: False
any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
roles:
- { role: kubespray-defaults }
- { role: kubernetes/node, tags: node } - { role: kubernetes/node, tags: node }
environment: "{{ proxy_env }}"
- name: Target only workers to get kubelet installed and checking in on any new nodes(network)
hosts: kube-node
gather_facts: False
any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
roles:
- { role: kubespray-defaults }
- { role: kubernetes/kubeadm, tags: kubeadm } - { role: kubernetes/kubeadm, tags: kubeadm }
- { role: network_plugin, tags: network } - { role: network_plugin, tags: network }
- { role: kubernetes/node-label, tags: node-label } - { role: kubernetes/node-label, tags: node-label }