Merge pull request #46987 from Cynerva/gkk/rm-initializers-before-1.7

Automatic merge from submit-queue Remove Initializers from admission-control in kubernetes-master charm for pre-1.7 **What this PR does / why we need it**: This fixes a problem with the kubernetes-master charm where kube-apiserver never comes up: ``` failed to initialize admission: Unknown admission plugin: Initializers ``` The Initializers plugin does not exist before Kubernetes 1.7. The charm needs to support 1.6 as well. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47062 **Special notes for your reviewer**: This fixes a problem introduced by https://github.com/kubernetes/kubernetes/pull/36721 **Release note**: ```release-note Remove Initializers from admission-control in kubernetes-master charm for pre-1.7 ```

Merge pull request #46987 from Cynerva/gkk/rm-initializers-before-1.7
e72c64b7 · Kubernetes Submit Queue · GitHub · 88e1ecb4 · e52a8888 · e72c64b7
Commit e72c64b7 authored Jun 08, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

kubernetes_master.py ...ju/layers/kubernetes-master/reactive/kubernetes_master.py +3 -0

No files found.
--- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
+++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
@@ -803,6 +803,9 @@ def configure_master_services():
    if get_version('kube-apiserver') < (1, 6):
        hookenv.log('Removing DefaultTolerationSeconds from admission-control')
        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)

    # Default to 3 minute resync. TODO: Make this configureable?