github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable initializers by default

Browse Source
This commit is contained in:
Jordan Liggitt
2018-07-10 15:14:32 -04:00
parent 3b269e182d
commit d98cbb2332
8 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@@ -1248,7 +1248,6 @@ def configure_apiserver(etcd_connection_string):
api_opts['etcd-servers'] = etcd_connection_string
admission_control_pre_1_9 = [
'Initializers',
'NamespaceLifecycle',
'LimitRanger',
'ServiceAccount',
@@ -1278,9 +1277,6 @@ def configure_apiserver(etcd_connection_string):
if kube_version < (1, 6):
hookenv.log('Removing DefaultTolerationSeconds from admission-control')
admission_control_pre_1_9.remove('DefaultTolerationSeconds')
if kube_version < (1, 7):
hookenv.log('Removing Initializers from admission-control')
admission_control_pre_1_9.remove('Initializers')
if kube_version < (1, 9):
api_opts['admission-control'] = ','.join(admission_control_pre_1_9)
else: