github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61427 from hyperbolic2346/mwilson/admission

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 61402, 61143, 61427, 60592). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Changing admission controller settings

**What this PR does / why we need it**:
By default, the admission controller settings in a CDK cluster didn't match the set recommended here:
https://kubernetes.io/docs/admin/admission-controllers/#is-there-a-recommended-set-of-admission-controllers-to-use

Now they do.
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #
https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/517
**Special notes for your reviewer**:

**Release note**:
```release-note
Updated admission controller settings for Juju deployed Kubernetes clusters
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-27 15:33:12 -07:00 committed by GitHub
commit f9c9a25e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1144,7 +1144,7 @@ def configure_apiserver(etcd_connection_string, leader_etcd_version):
api_opts['etcd-certfile'] = etcd_cert api_opts['etcd-certfile'] = etcd_cert
api_opts['etcd-servers'] = etcd_connection_string api_opts['etcd-servers'] = etcd_connection_string
admission_control = [ admission_control_pre_1_9 = [
'Initializers', 'Initializers',
'NamespaceLifecycle', 'NamespaceLifecycle',
'LimitRanger', 'LimitRanger',
@ -1153,19 +1153,35 @@ def configure_apiserver(etcd_connection_string, leader_etcd_version):
'DefaultTolerationSeconds' 'DefaultTolerationSeconds'
] ]
admission_control = [
'NamespaceLifecycle',
'LimitRanger',
'ServiceAccount',
'PersistentVolumeLabel',
'DefaultStorageClass',
'DefaultTolerationSeconds',
'MutatingAdmissionWebhook',
'ValidatingAdmissionWebhook',
'ResourceQuota'
]
auth_mode = hookenv.config('authorization-mode') auth_mode = hookenv.config('authorization-mode')
if 'Node' in auth_mode: if 'Node' in auth_mode:
admission_control.append('NodeRestriction') admission_control.append('NodeRestriction')
api_opts['authorization-mode'] = auth_mode api_opts['authorization-mode'] = auth_mode
if get_version('kube-apiserver') < (1, 6): kube_version = get_version('kube-apiserver')
if kube_version < (1, 6):
hookenv.log('Removing DefaultTolerationSeconds from admission-control') hookenv.log('Removing DefaultTolerationSeconds from admission-control')
admission_control.remove('DefaultTolerationSeconds') admission_control_pre_1_9.remove('DefaultTolerationSeconds')
if get_version('kube-apiserver') < (1, 7): if kube_version < (1, 7):
hookenv.log('Removing Initializers from admission-control') hookenv.log('Removing Initializers from admission-control')
admission_control.remove('Initializers') admission_control_pre_1_9.remove('Initializers')
api_opts['admission-control'] = ','.join(admission_control) if kube_version < (1, 9):
api_opts['admission-control'] = ','.join(admission_control_pre_1_9)
else:
api_opts['admission-control'] = ','.join(admission_control)
configure_kubernetes_service('kube-apiserver', api_opts, 'api-extra-args') configure_kubernetes_service('kube-apiserver', api_opts, 'api-extra-args')
restart_apiserver() restart_apiserver()