diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml index c13b6e833d3..08450579a7d 100644 --- a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml +++ b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml @@ -122,15 +122,6 @@ - item in kube_apiserver_admission_plugins_needs_configuration loop: "{{ kube_apiserver_enable_admission_plugins }}" -- name: Kubeadm | Configure default cluster podnodeslector - template: - src: "podnodeselector.yaml.j2" - dest: "{{ kube_config_dir }}/admission-controls/podnodeselector.yaml" - mode: "0640" - when: - - kube_apiserver_admission_plugins_podnodeselector_default_node_selector is defined - - kube_apiserver_admission_plugins_podnodeselector_default_node_selector | length > 0 - - name: Kubeadm | Check apiserver.crt SANs vars: apiserver_ips: "{{ apiserver_sans | map('ansible.utils.ipaddr') | reject('equalto', False) | list }}" diff --git a/roles/kubernetes/control-plane/vars/main.yaml b/roles/kubernetes/control-plane/vars/main.yaml index f888d6b0ce8..3775d253a7c 100644 --- a/roles/kubernetes/control-plane/vars/main.yaml +++ b/roles/kubernetes/control-plane/vars/main.yaml @@ -1,3 +1,8 @@ --- # list of admission plugins that needs to be configured -kube_apiserver_admission_plugins_needs_configuration: [EventRateLimit, PodSecurity] +# https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/ +kube_apiserver_admission_plugins_needs_configuration: +- EventRateLimit +- ImagePolicyWebhook +- PodSecurity +- PodNodeSelector