Fix the PR according to code review comments

kubernetes-sigs · Jul 21, 2022 · d93d26f · d93d26f
1 parent 432df40
commit d93d26f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/roles/kubernetes/control-plane/defaults/main/main.yml b/roles/kubernetes/control-plane/defaults/main/main.yml
@@ -116,7 +116,6 @@ kube_pod_security_exemptions_runtime_class_names: []
 kube_pod_security_exemptions_namespaces:
   - kube-system
 
-
 # 1.10+ list of disabled admission plugins
 kube_apiserver_disable_admission_plugins: []
 

diff --git a/roles/kubernetes/control-plane/templates/podsecurity.v1beta2.yaml.j2 b/roles/kubernetes/control-plane/templates/podsecurity.v1beta2.yaml.j2
@@ -1,4 +1,3 @@
-{% if kube_pod_security_use_default %}
 apiVersion: pod-security.admission.config.k8s.io/v1beta1
 kind: PodSecurityConfiguration
 defaults:
@@ -12,4 +11,3 @@ exemptions:
   usernames: {{ kube_pod_security_exemptions_usernames|to_json }}
   runtimeClasses: {{ kube_pod_security_exemptions_runtime_class_names|to_json }}
   namespaces: {{ kube_pod_security_exemptions_namespaces|to_json }}
-{% endif %}
diff --git a/roles/kubernetes/control-plane/vars/main.yaml b/roles/kubernetes/control-plane/vars/main.yaml
@@ -1,3 +1,3 @@
 ---
 # list of admission plugins that needs to be configured
-kube_apiserver_admission_plugins_needs_configuration: [EventRateLimit, PodSecurity]
+kube_apiserver_admission_plugins_needs_configuration: "{{ ['EventRateLimit', kube_pod_security_use_default|ternary('PodSecurity', None)]|select('string') }}"