Skip to content

Commit d777050

Browse files
committed
refactor: streamline kube-apiserver restart notifications
1 parent 08dc8e0 commit d777050

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

roles/kubernetes/control-plane/tasks/kubeadm-setup.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@
6060
src: apiserver-audit-policy.yaml.j2
6161
dest: "{{ audit_policy_file }}"
6262
mode: "0640"
63-
register: apiserver_audit_policy_update
6463
when: kubernetes_audit | default(false) or kubernetes_audit_webhook | default(false)
64+
notify: Control plane | Restart apiserver
6565

6666
- name: Write api audit webhook config yaml
6767
template:
6868
src: apiserver-audit-webhook-config.yaml.j2
6969
dest: "{{ audit_webhook_config_file }}"
7070
mode: "0640"
71-
register: apiserver_audit_webhook_config_update
7271
when: kubernetes_audit_webhook | default(false)
72+
notify: Control plane | Restart apiserver
7373

7474
- name: Create apiserver tracing config directory
7575
file:
@@ -83,8 +83,8 @@
8383
src: apiserver-tracing.yaml.j2
8484
dest: "{{ kube_config_dir }}/tracing/apiserver-tracing.yaml"
8585
mode: "0640"
86-
register: apiserver_tracing_config_update
8786
when: kube_apiserver_tracing
87+
notify: Control plane | Restart apiserver
8888

8989
# Nginx LB(default), If kubeadm_config_api_fqdn is defined, use other LB by kubeadm controlPlaneEndpoint.
9090
- name: Set kubeadm_config_api_fqdn define
@@ -111,19 +111,19 @@
111111
src: "admission-controls.yaml.j2"
112112
dest: "{{ kube_config_dir }}/admission-controls/admission-controls.yaml"
113113
mode: "0640"
114-
register: apiserver_admission_control_config_update
115114
when: kube_apiserver_admission_control_config_file
115+
notify: Control plane | Restart apiserver
116116

117117
- name: Kubeadm | Push admission control config files
118118
template:
119119
src: "{{ item | lower }}.yaml.j2"
120120
dest: "{{ kube_config_dir }}/admission-controls/{{ item | lower }}.yaml"
121121
mode: "0640"
122-
register: apiserver_admission_control_plugin_config_update
123122
when:
124123
- kube_apiserver_admission_control_config_file
125124
- item in kube_apiserver_admission_plugins_needs_configuration
126125
loop: "{{ kube_apiserver_enable_admission_plugins }}"
126+
notify: Control plane | Restart apiserver
127127

128128
- name: Kubeadm | Check apiserver.crt SANs
129129
vars:
@@ -240,20 +240,6 @@
240240
- upgrade_cluster_setup
241241
- kubeadm_already_run.stat.exists
242242

243-
- name: Kubeadm | Trigger restart kube-apiserver
244-
debug:
245-
msg: Detected changes in kube-apiserver config files
246-
changed_when: true
247-
when:
248-
- kubeadm_already_run.stat.exists
249-
- >
250-
apiserver_audit_policy_update.changed or
251-
apiserver_audit_webhook_config_update.changed or
252-
apiserver_tracing_config_update.changed or
253-
apiserver_admission_control_config_update.changed or
254-
apiserver_admission_control_plugin_config_update.changed
255-
notify: Control plane | Restart apiserver
256-
257243
# FIXME(mattymo): from docs: If you don't want to taint your control-plane node, set this field to an empty slice, i.e. `taints: {}` in the YAML file.
258244
- name: Kubeadm | Remove taint for control plane node with node role
259245
command: "{{ kubectl }} taint node {{ inventory_hostname }} {{ item }}"

0 commit comments

Comments
 (0)