Remove workaround for kubeadm upgrade (#6478)

https://github.com/kubernetes/kubeadm/issues/1498 was closed
This commit is contained in:
Florent Monbillard 2020-08-03 04:17:40 -04:00 committed by GitHub
parent 24a7878e7c
commit 39b907cdfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -27,8 +27,6 @@
failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr
notify: Master | restart kubelet notify: Master | restart kubelet
# FIXME: https://github.com/kubernetes/kubeadm/issues/1498 remove stdout_lines
# check after issue is fixed
- name: kubeadm | Upgrade other masters - name: kubeadm | Upgrade other masters
command: >- command: >-
timeout -k 600s 600s timeout -k 600s 600s
@ -44,7 +42,6 @@
failed_when: failed_when:
- kubeadm_upgrade.rc != 0 - kubeadm_upgrade.rc != 0
- '"field is immutable" not in kubeadm_upgrade.stderr' - '"field is immutable" not in kubeadm_upgrade.stderr'
- kubeadm_upgrade.stdout_lines | length > 1
notify: Master | restart kubelet notify: Master | restart kubelet
- name: kubeadm | clean kubectl cache to refresh api types - name: kubeadm | clean kubectl cache to refresh api types