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

Remove initializers from juju admission-control for 1.6 and earlier

Browse Source
This commit is contained in:
George Kraft
2017-06-05 13:32:43 -05:00
parent 0cff839317
commit e52a888814
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -802,6 +802,9 @@ def configure_master_services():
if get_version('kube-apiserver') < (1, 6): if get_version('kube-apiserver') < (1, 6):
hookenv.log('Removing DefaultTolerationSeconds from admission-control') hookenv.log('Removing DefaultTolerationSeconds from admission-control')
admission_control.remove('DefaultTolerationSeconds') admission_control.remove('DefaultTolerationSeconds')
if get_version('kube-apiserver') < (1, 7):
hookenv.log('Removing Initializers from admission-control')
admission_control.remove('Initializers')
api_opts.add('admission-control', ','.join(admission_control), strict=True) api_opts.add('admission-control', ','.join(admission_control), strict=True)
# Default to 3 minute resync. TODO: Make this configureable? # Default to 3 minute resync. TODO: Make this configureable?