diff --git a/roles/etcd-restore/tasks/redhat/6-kube-scheduler-restart.yml b/roles/etcd-restore/tasks/redhat/6-kube-scheduler-restart.yml new file mode 100644 index 0000000..8dc4fb3 --- /dev/null +++ b/roles/etcd-restore/tasks/redhat/6-kube-scheduler-restart.yml @@ -0,0 +1,25 @@ +--- +- name: "[{{ target }} / 6-kube-scheduler-restart.yml] get kube-scheduler container id" + shell: crictl ps -a |grep kube-scheduler | awk '{print $1}' + register: kube_apiserver_ids + +- name: "[{{ target }} / 6-kube-scheduler-restart.yml] kube-scheduler restart" + shell: crictl stop {{ item }} && crictl rm {{ item }} + loop: "{{ kube_apiserver_ids.stdout_lines }}" + when: kube_apiserver_ids.stdout_lines | length > 0 + +- name: "[{{ target }} / 6-kube-scheduler-restart.yml] kube-scheduler running check" + shell: crictl ps -a |grep kube-scheduler + register: apiserver_running_check + until: apiserver_running_check.stdout | trim != "" + retries: 300 + delay: 10 + +- name: "[{{ target }} / 6-kube-scheduler-restart.yml] kube-scheduler status" + shell: crictl ps -a |grep kube-scheduler + register: apiserver_status + +- name: "[{{ target }} / 6-kube-scheduler-restart.yml] kube-scheduler status" + debug: + msg: + "{{ apiserver_status }}" \ No newline at end of file diff --git a/roles/etcd-restore/tasks/redhat/7-kube-controller-manager-restart.yml b/roles/etcd-restore/tasks/redhat/7-kube-controller-manager-restart.yml new file mode 100644 index 0000000..625938e --- /dev/null +++ b/roles/etcd-restore/tasks/redhat/7-kube-controller-manager-restart.yml @@ -0,0 +1,25 @@ +--- +- name: "[{{ target }} / 7-kube-controller-manager-restart.yml] get kube-controller-manager container id" + shell: crictl ps -a |grep kube-controller-manager | awk '{print $1}' + register: kube_apiserver_ids + +- name: "[{{ target }} / 7-kube-controller-manager-restart.yml] kube-controller-manager restart" + shell: crictl stop {{ item }} && crictl rm {{ item }} + loop: "{{ kube_apiserver_ids.stdout_lines }}" + when: kube_apiserver_ids.stdout_lines | length > 0 + +- name: "[{{ target }} / 7-kube-controller-manager-restart.yml] kube-controller-manager running check" + shell: crictl ps -a |grep kube-controller-manager + register: apiserver_running_check + until: apiserver_running_check.stdout | trim != "" + retries: 300 + delay: 10 + +- name: "[{{ target }} / 7-kube-controller-manager-restart.yml] kube-controller-manager status" + shell: crictl ps -a |grep kube-controller-manager + register: apiserver_status + +- name: "[{{ target }} / 7-kube-controller-manager-restart.yml] kube-controller-manager status" + debug: + msg: + "{{ apiserver_status }}" \ No newline at end of file diff --git a/roles/etcd-restore/tasks/redhat/6-calico-restart.yml b/roles/etcd-restore/tasks/redhat/8-calico-restart.yml similarity index 100% rename from roles/etcd-restore/tasks/redhat/6-calico-restart.yml rename to roles/etcd-restore/tasks/redhat/8-calico-restart.yml diff --git a/roles/etcd-restore/tasks/redhat/main.yml b/roles/etcd-restore/tasks/redhat/main.yml index 6b66912..a804c7e 100644 --- a/roles/etcd-restore/tasks/redhat/main.yml +++ b/roles/etcd-restore/tasks/redhat/main.yml @@ -25,6 +25,16 @@ ("member-cluster" in group_names) and target == "member" - include: "5-kube-apiserver-restart.yml" + when: + - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or + ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member" + +- include: "6-kube-scheduler-restart.yml" + when: + - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or + ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member" + +- include: "7-kube-controller-manager-restart.yml" when: - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member" \ No newline at end of file