mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-21 07:47:49 -02:30
Rename master to control plane - non-breaking changes only (#11394)
K8s is moving away from the "master" terminology, so kubespray should follow the same naming conventions. See 65d886bb30/sig-architecture/naming/recommendations/001-master-control-plane.md
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
---
|
||||
- name: Master | reload systemd
|
||||
- name: Control plane | reload systemd
|
||||
systemd_service:
|
||||
daemon_reload: true
|
||||
listen: Master | restart kubelet
|
||||
listen: Control plane | restart kubelet
|
||||
|
||||
- name: Master | reload kubelet
|
||||
- name: Control plane | reload kubelet
|
||||
service:
|
||||
name: kubelet
|
||||
state: restarted
|
||||
listen: Master | restart kubelet
|
||||
listen: Control plane | restart kubelet
|
||||
|
||||
- name: Master | Remove apiserver container docker
|
||||
- name: Control plane | Remove apiserver container docker
|
||||
shell: "set -o pipefail && docker ps -af name=k8s_kube-apiserver* -q | xargs --no-run-if-empty docker rm -f"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -19,9 +19,9 @@
|
||||
until: remove_apiserver_container.rc == 0
|
||||
delay: 1
|
||||
when: container_manager == "docker"
|
||||
listen: Master | Restart apiserver
|
||||
listen: Control plane | Restart apiserver
|
||||
|
||||
- name: Master | Remove apiserver container containerd/crio
|
||||
- name: Control plane | Remove apiserver container containerd/crio
|
||||
shell: "set -o pipefail && {{ bin_dir }}/crictl pods --name kube-apiserver* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -30,9 +30,9 @@
|
||||
until: remove_apiserver_container.rc == 0
|
||||
delay: 1
|
||||
when: container_manager in ['containerd', 'crio']
|
||||
listen: Master | Restart apiserver
|
||||
listen: Control plane | Restart apiserver
|
||||
|
||||
- name: Master | Remove scheduler container docker
|
||||
- name: Control plane | Remove scheduler container docker
|
||||
shell: "set -o pipefail && {{ docker_bin_dir }}/docker ps -af name=k8s_kube-scheduler* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -41,9 +41,9 @@
|
||||
until: remove_scheduler_container.rc == 0
|
||||
delay: 1
|
||||
when: container_manager == "docker"
|
||||
listen: Master | Restart kube-scheduler
|
||||
listen: Control plane | Restart kube-scheduler
|
||||
|
||||
- name: Master | Remove scheduler container containerd/crio
|
||||
- name: Control plane | Remove scheduler container containerd/crio
|
||||
shell: "set -o pipefail && {{ bin_dir }}/crictl pods --name kube-scheduler* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -52,9 +52,9 @@
|
||||
until: remove_scheduler_container.rc == 0
|
||||
delay: 1
|
||||
when: container_manager in ['containerd', 'crio']
|
||||
listen: Master | Restart kube-scheduler
|
||||
listen: Control plane | Restart kube-scheduler
|
||||
|
||||
- name: Master | Remove controller manager container docker
|
||||
- name: Control plane | Remove controller manager container docker
|
||||
shell: "set -o pipefail && {{ docker_bin_dir }}/docker ps -af name=k8s_kube-controller-manager* -q | xargs --no-run-if-empty {{ docker_bin_dir }}/docker rm -f"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -63,9 +63,9 @@
|
||||
until: remove_cm_container.rc == 0
|
||||
delay: 1
|
||||
when: container_manager == "docker"
|
||||
listen: Master | Restart kube-controller-manager
|
||||
listen: Control plane | Restart kube-controller-manager
|
||||
|
||||
- name: Master | Remove controller manager container containerd/crio
|
||||
- name: Control plane | Remove controller manager container containerd/crio
|
||||
shell: "set -o pipefail && {{ bin_dir }}/crictl pods --name kube-controller-manager* -q | xargs -I% --no-run-if-empty bash -c '{{ bin_dir }}/crictl stopp % && {{ bin_dir }}/crictl rmp %'"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
@@ -74,9 +74,9 @@
|
||||
until: remove_cm_container.rc == 0
|
||||
delay: 1
|
||||
when: container_manager in ['containerd', 'crio']
|
||||
listen: Master | Restart kube-controller-manager
|
||||
listen: Control plane | Restart kube-controller-manager
|
||||
|
||||
- name: Master | wait for kube-scheduler
|
||||
- name: Control plane | wait for kube-scheduler
|
||||
vars:
|
||||
endpoint: "{{ kube_scheduler_bind_address if kube_scheduler_bind_address != '0.0.0.0' else 'localhost' }}"
|
||||
uri:
|
||||
@@ -87,10 +87,10 @@
|
||||
retries: 60
|
||||
delay: 1
|
||||
listen:
|
||||
- Master | restart kubelet
|
||||
- Master | Restart kube-scheduler
|
||||
- Control plane | restart kubelet
|
||||
- Control plane | Restart kube-scheduler
|
||||
|
||||
- name: Master | wait for kube-controller-manager
|
||||
- name: Control plane | wait for kube-controller-manager
|
||||
vars:
|
||||
endpoint: "{{ kube_controller_manager_bind_address if kube_controller_manager_bind_address != '0.0.0.0' else 'localhost' }}"
|
||||
uri:
|
||||
@@ -101,10 +101,10 @@
|
||||
retries: 60
|
||||
delay: 1
|
||||
listen:
|
||||
- Master | restart kubelet
|
||||
- Master | Restart kube-controller-manager
|
||||
- Control plane | restart kubelet
|
||||
- Control plane | Restart kube-controller-manager
|
||||
|
||||
- name: Master | wait for the apiserver to be running
|
||||
- name: Control plane | wait for the apiserver to be running
|
||||
uri:
|
||||
url: "{{ kube_apiserver_endpoint }}/healthz"
|
||||
validate_certs: false
|
||||
@@ -113,5 +113,5 @@
|
||||
retries: 60
|
||||
delay: 1
|
||||
listen:
|
||||
- Master | restart kubelet
|
||||
- Master | Restart apiserver
|
||||
- Control plane | restart kubelet
|
||||
- Control plane | Restart apiserver
|
||||
|
||||
Reference in New Issue
Block a user