mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #61427 from hyperbolic2346/mwilson/admission
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:
commit
f9c9a25e64
@ -1144,7 +1144,7 @@ def configure_apiserver(etcd_connection_string, leader_etcd_version):
|
||||
api_opts['etcd-certfile'] = etcd_cert
|
||||
api_opts['etcd-servers'] = etcd_connection_string
|
||||
|
||||
admission_control = [
|
||||
admission_control_pre_1_9 = [
|
||||
'Initializers',
|
||||
'NamespaceLifecycle',
|
||||
'LimitRanger',
|
||||
@ -1153,19 +1153,35 @@ def configure_apiserver(etcd_connection_string, leader_etcd_version):
|
||||
'DefaultTolerationSeconds'
|
||||
]
|
||||
|
||||
admission_control = [
|
||||
'NamespaceLifecycle',
|
||||
'LimitRanger',
|
||||
'ServiceAccount',
|
||||
'PersistentVolumeLabel',
|
||||
'DefaultStorageClass',
|
||||
'DefaultTolerationSeconds',
|
||||
'MutatingAdmissionWebhook',
|
||||
'ValidatingAdmissionWebhook',
|
||||
'ResourceQuota'
|
||||
]
|
||||
|
||||
auth_mode = hookenv.config('authorization-mode')
|
||||
if 'Node' in auth_mode:
|
||||
admission_control.append('NodeRestriction')
|
||||
|
||||
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')
|
||||
admission_control.remove('DefaultTolerationSeconds')
|
||||
if get_version('kube-apiserver') < (1, 7):
|
||||
admission_control_pre_1_9.remove('DefaultTolerationSeconds')
|
||||
if kube_version < (1, 7):
|
||||
hookenv.log('Removing Initializers from admission-control')
|
||||
admission_control.remove('Initializers')
|
||||
api_opts['admission-control'] = ','.join(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:
|
||||
api_opts['admission-control'] = ','.join(admission_control)
|
||||
|
||||
configure_kubernetes_service('kube-apiserver', api_opts, 'api-extra-args')
|
||||
restart_apiserver()
|
||||
|
Loading…
Reference in New Issue
Block a user