diff --git a/roles/kubernetes/master/defaults/main/main.yml b/roles/kubernetes/master/defaults/main/main.yml index c9293ffc6a622161798a7ceac355c25281e3ed1c..408da58eab531debe172f8de25c6638b2e4a3127 100644 --- a/roles/kubernetes/master/defaults/main/main.yml +++ b/roles/kubernetes/master/defaults/main/main.yml @@ -95,17 +95,6 @@ kube_apiserver_memory_requests: 256M kube_apiserver_cpu_requests: 100m kube_apiserver_request_timeout: "1m0s" -# 1.9 and below Admission control plug-ins -kube_apiserver_admission_control: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - PersistentVolumeClaimResize - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - ResourceQuota - # 1.10+ admission plugins kube_apiserver_enable_admission_plugins: [] diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml index e278b19503e85fb39ce353919579c9345239dea4..d3835934d7ca67e9e2d2e6ed4f003b808031fefc 100644 --- a/roles/kubernetes/master/tasks/main.yml +++ b/roles/kubernetes/master/tasks/main.yml @@ -61,7 +61,6 @@ - name: Disable SecurityContextDeny admission-controller and enable PodSecurityPolicy set_fact: - kube_apiserver_admission_control: "{{ kube_apiserver_admission_control | default([]) | difference(['SecurityContextDeny']) | union(['PodSecurityPolicy']) | unique }}" kube_apiserver_enable_admission_plugins: "{{ kube_apiserver_enable_admission_plugins | difference(['SecurityContextDeny']) | union(['PodSecurityPolicy']) | unique }}" when: podsecuritypolicy_enabled