Remove deletion of coredns deployment. (#7211)
* Add unique annotation on coredns deployment and only remove existing deployment if annotation is missing.
* Ignore errors when gathering coredns deployment details to handle case where it doesn't exist yet
* Remove run_once, deletegate_to and add to when statement
(cherry picked from commit 0cc1726781
)
This commit is contained in:
parent
5f06864582
commit
189ce380bd
2 changed files with 11 additions and 0 deletions
|
@ -1,4 +1,13 @@
|
||||||
---
|
---
|
||||||
|
- name: Kubernetes Apps | Register coredns deployment annotation `createdby`
|
||||||
|
shell: "{{ bin_dir }}/kubectl get deploy -n kube-system coredns -o jsonpath='{ .spec.template.metadata.annotations.createdby }'"
|
||||||
|
register: createdby_annotation
|
||||||
|
changed_when: false
|
||||||
|
ignore_errors: true
|
||||||
|
when:
|
||||||
|
- dns_mode in ['coredns', 'coredns_dual']
|
||||||
|
- inventory_hostname == groups['kube-master'][0]
|
||||||
|
|
||||||
- name: Kubernetes Apps | Delete kubeadm CoreDNS
|
- name: Kubernetes Apps | Delete kubeadm CoreDNS
|
||||||
kube:
|
kube:
|
||||||
name: "coredns"
|
name: "coredns"
|
||||||
|
@ -9,6 +18,7 @@
|
||||||
when:
|
when:
|
||||||
- dns_mode in ['coredns', 'coredns_dual']
|
- dns_mode in ['coredns', 'coredns_dual']
|
||||||
- inventory_hostname == groups['kube-master'][0]
|
- inventory_hostname == groups['kube-master'][0]
|
||||||
|
- createdby_annotation.stdout != 'kubespray'
|
||||||
|
|
||||||
- name: Kubernetes Apps | Delete kubeadm Kube-DNS service
|
- name: Kubernetes Apps | Delete kubeadm Kube-DNS service
|
||||||
kube:
|
kube:
|
||||||
|
|
|
@ -23,6 +23,7 @@ spec:
|
||||||
k8s-app: kube-dns{{ coredns_ordinal_suffix }}
|
k8s-app: kube-dns{{ coredns_ordinal_suffix }}
|
||||||
annotations:
|
annotations:
|
||||||
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
|
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
|
||||||
|
createdby: 'kubespray'
|
||||||
spec:
|
spec:
|
||||||
priorityClassName: system-cluster-critical
|
priorityClassName: system-cluster-critical
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
|
|
Loading…
Reference in a new issue