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

Merge pull request #3248 from derekwaynecarr/admission_control_hooks

Browse Source 
Implement basic admission control framework
This commit is contained in:
Eric Tune
2015-01-07 16:52:49 -08:00
parent 5f67b205a3 a56087cdf8
commit c2b3d678c0
25 changed files with 634 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/saltbase/salt/kube-apiserver/default
View File

@@ -46,4 +46,9 @@
{% endif -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"
{% set admission_control = "" -%}
{% if grains.admission_control is defined -%}
{% set admission_control = "-admission_control=" + grains.admission_control -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} {{admission_control}} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}} {{pillar['log_level']}}"

1
cluster/vagrant/provision-master.sh
View File

@@ -75,6 +75,7 @@ grains:
cloud_provider: vagrant
roles:
- kubernetes-master
admission_control: AlwaysAdmit
EOF
mkdir -p /srv/salt-overlay/pillar