From da86457cdafc592eae0066ff5e63829fe5b4bbca Mon Sep 17 00:00:00 2001
From: Adrien Gooris <adrien.gooris@gmail.com>
Date: Wed, 19 Feb 2020 14:08:25 +0100
Subject: [PATCH] remove unused var 'kube_apiserver_admission_control' (#5648)
 (#5651)

---
 roles/kubernetes/master/defaults/main/main.yml | 11 -----------
 roles/kubernetes/master/tasks/main.yml         |  1 -
 2 files changed, 12 deletions(-)

diff --git a/roles/kubernetes/master/defaults/main/main.yml b/roles/kubernetes/master/defaults/main/main.yml
index c9293ffc6..408da58ea 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 e278b1950..d3835934d 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