From a3f568fc643ad1041756546b4f17e3736333aa00 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Fri, 24 Mar 2017 18:29:28 +0300
Subject: [PATCH] restart scheduler and controller-manager too
---
roles/kubernetes/master/tasks/main.yml | 2 ++
.../kubernetes/master/tasks/post-upgrade.yml | 9 +++++++++
roles/kubernetes/master/tasks/pre-upgrade.yml | 20 ++++++-------------
.../kubernetes/secrets/tasks/check-tokens.yml | 4 ++--
roles/upgrade/pre-upgrade/defaults/main.yml | 3 +++
roles/upgrade/pre-upgrade/tasks/main.yml | 4 ++--
6 files changed, 24 insertions(+), 18 deletions(-)
create mode 100644 roles/upgrade/pre-upgrade/defaults/main.yml
diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml
index f0e944bd9..2c669c46d 100644
--- a/roles/kubernetes/master/tasks/main.yml
+++ b/roles/kubernetes/master/tasks/main.yml
@@ -54,6 +54,8 @@
command: "{{ bin_dir }}/kubectl create -f {{kube_config_dir}}/{{system_namespace}}-ns.yml"
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
+ register: create_system_ns
+ until: create_system_ns.rc == 0
changed_when: False
when: kubesystem|failed and inventory_hostname == groups['kube-master'][0]
tags: apps
diff --git a/roles/kubernetes/master/tasks/post-upgrade.yml b/roles/kubernetes/master/tasks/post-upgrade.yml
index e68526493..d157311de 100644
--- a/roles/kubernetes/master/tasks/post-upgrade.yml
+++ b/roles/kubernetes/master/tasks/post-upgrade.yml
@@ -1,4 +1,13 @@
---
+- name: "Post-upgrade | restart kubelet on all masters"
+ service:
+ name: kubelet
+ state: restarted
+ delegate_to: "{{item}}"
+ with_items: "{{groups['kube-master']}}"
+ register: kube_apiserver_manifest_replaced
+ when: needs_etcd_migration|bool
+
- name: "Post-upgrade | etcd3 upgrade | purge etcd2 k8s data"
command: "{{ bin_dir }}/etcdctl --endpoints={{ etcd_access_addresses }} rm -r /registry"
environment:
diff --git a/roles/kubernetes/master/tasks/pre-upgrade.yml b/roles/kubernetes/master/tasks/pre-upgrade.yml
index 7776b9703..12b270421 100644
--- a/roles/kubernetes/master/tasks/pre-upgrade.yml
+++ b/roles/kubernetes/master/tasks/pre-upgrade.yml
@@ -55,13 +55,15 @@
set_fact:
needs_etcd_migration: "{{ kube_apiserver_storage_backend == 'etcd3' and data_migrated.stdout_lines|length == 0 and old_data_exists.rc == 0 }}"
-- name: "Pre-upgrade | Write invalid image to kube-apiserver manifest if necessary on all kube-masters"
+- name: "Pre-upgrade | Write invalid image to master manifests on all kube-masters"
replace:
- dest: /etc/kubernetes/manifests/kube-apiserver.manifest
+ dest: "/etc/kubernetes/manifests/{{item[1]}}.manifest"
regexp: '(\s+)image:\s+.*?$'
replace: '\1image: kill.apiserver.using.fake.image.in:manifest'
- delegate_to: "{{item}}"
- with_items: "{{groups['kube-master']}}"
+ delegate_to: "{{item[0]}}"
+ with_nested:
+ - "{{groups['kube-master']}}"
+ - ["kube-apiserver", "kube-controller-manager", "kube-scheduler"]
register: kube_apiserver_manifest_replaced
when: (secret_changed|default(false) or etcd_secret_changed|default(false) or needs_etcd_migration|bool) and kube_apiserver_manifest.stat.exists
@@ -95,13 +97,3 @@
delegate_to: "{{item}}"
with_items: "{{groups['etcd']}}"
when: needs_etcd_migration|bool
-
-- name: "Pre-upgrade | restart kubelet on all masters"
- service:
- name: kubelet
- state: restarted
- delegate_to: "{{item}}"
- with_items: "{{groups['kube-master']}}"
- register: kube_apiserver_manifest_replaced
- when: needs_etcd_migration|bool
-
diff --git a/roles/kubernetes/secrets/tasks/check-tokens.yml b/roles/kubernetes/secrets/tasks/check-tokens.yml
index 497bc7caf..616664b93 100644
--- a/roles/kubernetes/secrets/tasks/check-tokens.yml
+++ b/roles/kubernetes/secrets/tasks/check-tokens.yml
@@ -27,9 +27,9 @@
sync_tokens: true
when: >-
{%- set tokens = {'sync': False} -%}
- {%- for server in groups['kube-master'] | intersect(ansible_play_hosts)
+ {%- for server in groups['kube-master'] | intersect(ansible_play_batch)
if (not hostvars[server].known_tokens.stat.exists) or
- (hostvars[server].known_tokens.stat.checksum != known_tokens_master.stat.checksum|default('')) -%}
+ (hostvars[server].known_tokens.stat.checksum|default('') != known_tokens_master.stat.checksum|default('')) -%}
{%- set _ = tokens.update({'sync': True}) -%}
{%- endfor -%}
{{ tokens.sync }}
diff --git a/roles/upgrade/pre-upgrade/defaults/main.yml b/roles/upgrade/pre-upgrade/defaults/main.yml
new file mode 100644
index 000000000..5980360fc
--- /dev/null
+++ b/roles/upgrade/pre-upgrade/defaults/main.yml
@@ -0,0 +1,3 @@
+drain_grace_period: 30
+drain_timeout: 40s
+
diff --git a/roles/upgrade/pre-upgrade/tasks/main.yml b/roles/upgrade/pre-upgrade/tasks/main.yml
index fbcd1cf85..f2251375b 100644
--- a/roles/upgrade/pre-upgrade/tasks/main.yml
+++ b/roles/upgrade/pre-upgrade/tasks/main.yml
@@ -1,9 +1,9 @@
---
- name: See if node is in ready state
- command: "kubectl get nodes | grep {{ inventory_hostname }}"
+ shell: "kubectl get nodes | grep {{ inventory_hostname }}"
register: kubectl_nodes
delegate_to: "{{ groups['kube-master'][0] }}"
- ignore_errors: true
+ failed_when: false
- set_fact:
needs_cordoning: >-
--
GitLab