Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
4ce39076
Unverified
Commit
4ce39076
authored
May 26, 2017
by
Clayton Coleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Initializers to all admission control paths by default
parent
2568a921
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
22 additions
and
21 deletions
+22
-21
config-default.sh
cluster/centos/config-default.sh
+1
-1
config-default.sh
cluster/gce/config-default.sh
+1
-1
config-test.sh
cluster/gce/config-test.sh
+1
-1
kubernetes_master.py
...ju/layers/kubernetes-master/reactive/kubernetes_master.py
+1
-0
util.sh
cluster/libvirt-coreos/util.sh
+1
-1
configure-salt.yaml
...nstack-heat/kubernetes-heat/fragments/configure-salt.yaml
+1
-1
create-dynamic-salt-files.sh
.../photon-controller/templates/create-dynamic-salt-files.sh
+1
-1
config-default.sh
cluster/vagrant/config-default.sh
+1
-1
constants.go
cmd/kubeadm/app/constants/constants.go
+1
-1
manifests_test.go
cmd/kubeadm/app/master/manifests_test.go
+4
-4
common.sh
federation/cluster/common.sh
+1
-1
init.go
federation/pkg/kubefed/init/init.go
+1
-1
init_test.go
federation/pkg/kubefed/init/init_test.go
+1
-1
local-up-cluster.sh
hack/local-up-cluster.sh
+1
-1
test-cmd.sh
hack/make-rules/test-cmd.sh
+1
-1
test-federation-cmd.sh
hack/make-rules/test-federation-cmd.sh
+1
-1
kube-apiserver.yaml
...ures/doc-yaml/admin/high-availability/kube-apiserver.yaml
+1
-1
master.yaml
...l/getting-started-guides/coreos/cloud-configs/master.yaml
+1
-1
start-kubemark.sh
test/kubemark/start-kubemark.sh
+1
-1
No files found.
cluster/centos/config-default.sh
View file @
4ce39076
...
...
@@ -120,7 +120,7 @@ export FLANNEL_NET=${FLANNEL_NET:-"172.16.0.0/16"}
# Admission Controllers to invoke prior to persisting objects in cluster
# If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
export
ADMISSION_CONTROL
=
${
ADMISSION_CONTROL
:-
"NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultTolerationSeconds,ResourceQuota"
}
export
ADMISSION_CONTROL
=
${
ADMISSION_CONTROL
:-
"
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultTolerationSeconds,ResourceQuota"
}
# Extra options to set on the Docker command line.
# This is useful for setting --insecure-registry for local registries.
...
...
cluster/gce/config-default.sh
View file @
4ce39076
...
...
@@ -217,7 +217,7 @@ fi
# Admission Controllers to invoke prior to persisting objects in cluster
# If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
ADMISSION_CONTROL
=
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
ADMISSION_CONTROL
=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
# Optional: if set to true kube-up will automatically check for existing resources and clean them up.
KUBE_UP_AUTOMATIC_CLEANUP
=
${
KUBE_UP_AUTOMATIC_CLEANUP
:-
false
}
...
...
cluster/gce/config-test.sh
View file @
4ce39076
...
...
@@ -247,7 +247,7 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
fi
# If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
ADMISSION_CONTROL
=
"
${
KUBE_ADMISSION_CONTROL
:-
NamespaceLifecycle
,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
}
"
ADMISSION_CONTROL
=
"
${
KUBE_ADMISSION_CONTROL
:-
Initializers
,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
}
"
# Optional: if set to true kube-up will automatically check for existing resources and clean them up.
KUBE_UP_AUTOMATIC_CLEANUP
=
${
KUBE_UP_AUTOMATIC_CLEANUP
:-
false
}
...
...
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @
4ce39076
...
...
@@ -791,6 +791,7 @@ def configure_master_services():
api_opts
.
add
(
'insecure-port'
,
'8080'
)
api_opts
.
add
(
'storage-backend'
,
'etcd2'
)
# FIXME: add etcd3 support
admission_control
=
[
'Initializers'
,
'NamespaceLifecycle'
,
'LimitRanger'
,
'ServiceAccount'
,
...
...
cluster/libvirt-coreos/util.sh
View file @
4ce39076
...
...
@@ -27,7 +27,7 @@ source "$KUBE_ROOT/cluster/common.sh"
export
LIBVIRT_DEFAULT_URI
=
qemu:///system
export
SERVICE_ACCOUNT_LOOKUP
=
${
SERVICE_ACCOUNT_LOOKUP
:-
true
}
export
ADMISSION_CONTROL
=
${
ADMISSION_CONTROL
:-
NamespaceLifecycle
,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
}
export
ADMISSION_CONTROL
=
${
ADMISSION_CONTROL
:-
Initializers
,
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
}
readonly
POOL
=
kubernetes
readonly
POOL_PATH
=
/var/lib/libvirt/images/kubernetes
...
...
cluster/openstack-heat/kubernetes-heat/fragments/configure-salt.yaml
View file @
4ce39076
...
...
@@ -57,7 +57,7 @@ write_files:
dns_domain: cluster.local
enable_dns_horizontal_autoscaler: "false"
instance_prefix: kubernetes
admission_control: NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
admission_control:
Initializers,
NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
enable_cpu_cfs_quota: "true"
network_provider: none
cluster_cidr: "$cluster_cidr"
...
...
cluster/photon-controller/templates/create-dynamic-salt-files.sh
View file @
4ce39076
...
...
@@ -122,5 +122,5 @@ dns_domain: $DNS_DOMAIN
e2e_storage_test_environment: "
${
E2E_STORAGE_TEST_ENVIRONMENT
:-
false
}
"
cluster_cidr: "
$NODE_IP_RANGES
"
allocate_node_cidrs: "
${
ALLOCATE_NODE_CIDRS
:-
true
}
"
admission_control: NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
admission_control:
Initializers,
NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
EOF
cluster/vagrant/config-default.sh
View file @
4ce39076
...
...
@@ -56,7 +56,7 @@ MASTER_PASSWD="${MASTER_PASSWD:-vagrant}"
# Admission Controllers to invoke prior to persisting objects in cluster
# If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
ADMISSION_CONTROL
=
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
ADMISSION_CONTROL
=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
# Optional: Enable node logging.
ENABLE_NODE_LOGGING
=
false
...
...
cmd/kubeadm/app/constants/constants.go
View file @
4ce39076
...
...
@@ -91,7 +91,7 @@ const (
MinExternalEtcdVersion
=
"3.0.14"
// DefaultAdmissionControl specifies the default admission control options that will be used
DefaultAdmissionControl
=
"NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
DefaultAdmissionControl
=
"
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
)
var
(
...
...
cmd/kubeadm/app/master/manifests_test.go
View file @
4ce39076
...
...
@@ -520,7 +520,7 @@ func TestGetAPIServerCommand(t *testing.T) {
expected
:
[]
string
{
"kube-apiserver"
,
"--insecure-port=0"
,
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--admission-control=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--service-cluster-ip-range=bar"
,
"--service-account-key-file="
+
testCertsDir
+
"/sa.pub"
,
"--client-ca-file="
+
testCertsDir
+
"/ca.crt"
,
...
...
@@ -552,7 +552,7 @@ func TestGetAPIServerCommand(t *testing.T) {
expected
:
[]
string
{
"kube-apiserver"
,
"--insecure-port=0"
,
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--admission-control=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--service-cluster-ip-range=bar"
,
"--service-account-key-file="
+
testCertsDir
+
"/sa.pub"
,
"--client-ca-file="
+
testCertsDir
+
"/ca.crt"
,
...
...
@@ -585,7 +585,7 @@ func TestGetAPIServerCommand(t *testing.T) {
expected
:
[]
string
{
"kube-apiserver"
,
"--insecure-port=0"
,
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--admission-control=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--service-cluster-ip-range=bar"
,
"--service-account-key-file="
+
testCertsDir
+
"/sa.pub"
,
"--client-ca-file="
+
testCertsDir
+
"/ca.crt"
,
...
...
@@ -620,7 +620,7 @@ func TestGetAPIServerCommand(t *testing.T) {
expected
:
[]
string
{
"kube-apiserver"
,
"--insecure-port=0"
,
"--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--admission-control=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds"
,
"--service-cluster-ip-range=bar"
,
"--service-account-key-file="
+
testCertsDir
+
"/sa.pub"
,
"--client-ca-file="
+
testCertsDir
+
"/ca.crt"
,
...
...
federation/cluster/common.sh
View file @
4ce39076
...
...
@@ -258,7 +258,7 @@ function create-federation-api-objects {
export
FEDERATION_APISERVER_KEY_BASE64
=
"
${
FEDERATION_APISERVER_KEY_BASE64
}
"
# Enable the NamespaceLifecycle admission control by default.
export
FEDERATION_ADMISSION_CONTROL
=
"
${
FEDERATION_ADMISSION_CONTROL
:-
NamespaceLifecycle
}
"
export
FEDERATION_ADMISSION_CONTROL
=
"
${
FEDERATION_ADMISSION_CONTROL
:-
Initializers
,
NamespaceLifecycle
}
"
for
file
in
federation-etcd-pvc.yaml federation-apiserver-
{
deployment,secrets
}
.yaml federation-controller-manager-deployment.yaml
;
do
echo
"Creating manifest:
${
file
}
"
...
...
federation/pkg/kubefed/init/init.go
View file @
4ce39076
...
...
@@ -692,7 +692,7 @@ func createAPIServer(clientset client.Interface, namespace, name, federationName
"--client-ca-file"
:
"/etc/federation/apiserver/ca.crt"
,
"--tls-cert-file"
:
"/etc/federation/apiserver/server.crt"
,
"--tls-private-key-file"
:
"/etc/federation/apiserver/server.key"
,
"--admission-control"
:
"NamespaceLifecycle"
,
"--admission-control"
:
"
Initializers,
NamespaceLifecycle"
,
}
if
advertiseAddress
!=
""
{
...
...
federation/pkg/kubefed/init/init_test.go
View file @
4ce39076
...
...
@@ -869,7 +869,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na
fmt
.
Sprintf
(
"--secure-port=%d"
,
apiServerSecurePort
),
"--tls-cert-file=/etc/federation/apiserver/server.crt"
,
"--tls-private-key-file=/etc/federation/apiserver/server.key"
,
"--admission-control=NamespaceLifecycle"
,
"--admission-control=
Initializers,
NamespaceLifecycle"
,
fmt
.
Sprintf
(
"--advertise-address=%s"
,
address
),
}
...
...
hack/local-up-cluster.sh
View file @
4ce39076
...
...
@@ -401,7 +401,7 @@ function start_apiserver {
fi
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL
=
NamespaceLifecycle,LimitRanger,ServiceAccount
${
security_admission
}
,ResourceQuota,DefaultStorageClass,DefaultTolerationSeconds
ADMISSION_CONTROL
=
Initializers,
NamespaceLifecycle,LimitRanger,ServiceAccount
${
security_admission
}
,ResourceQuota,DefaultStorageClass,DefaultTolerationSeconds
# This is the default dir and filename where the apiserver will generate a self-signed cert
# which should be able to be used as the CA to verify itself
...
...
hack/make-rules/test-cmd.sh
View file @
4ce39076
...
...
@@ -34,7 +34,7 @@ function run_kube_apiserver() {
kube::log::status
"Starting kube-apiserver"
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL
=
"NamespaceLifecycle,LimitRanger,ResourceQuota"
ADMISSION_CONTROL
=
"
Initializers,
NamespaceLifecycle,LimitRanger,ResourceQuota"
# Include RBAC (to exercise bootstrapping), and AlwaysAllow to allow all actions
AUTHORIZATION_MODE
=
"RBAC,AlwaysAllow"
...
...
hack/make-rules/test-federation-cmd.sh
View file @
4ce39076
...
...
@@ -34,7 +34,7 @@ function run_federation_apiserver() {
kube::log::status
"Starting federation-apiserver"
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL
=
"NamespaceLifecycle"
ADMISSION_CONTROL
=
"
Initializers,
NamespaceLifecycle"
"
${
KUBE_OUTPUT_HOSTBIN
}
/federation-apiserver"
\
--insecure-port
=
"
${
API_PORT
}
"
\
...
...
test/fixtures/doc-yaml/admin/high-availability/kube-apiserver.yaml
View file @
4ce39076
...
...
@@ -11,7 +11,7 @@ spec:
-
/bin/sh
-
-c
-
/usr/local/bin/kube-apiserver --address=127.0.0.1 --etcd-servers=http://127.0.0.1:4001
--cloud-provider=gce --admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
--cloud-provider=gce --admission-control=
Initializers,
NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
--service-cluster-ip-range=10.0.0.0/16 --client-ca-file=/srv/kubernetes/ca.crt
--basic-auth-file=/srv/kubernetes/basic_auth.csv --cluster-name=e2e-test-bburns
--tls-cert-file=/srv/kubernetes/server.cert --tls-private-key-file=/srv/kubernetes/server.key
...
...
test/fixtures/doc-yaml/getting-started-guides/coreos/cloud-configs/master.yaml
View file @
4ce39076
...
...
@@ -91,7 +91,7 @@ coreos:
ExecStart=/opt/bin/kube-apiserver \
--service-account-key-file=/opt/bin/kube-serviceaccount.key \
--service-account-lookup=true \
--admission-control=NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota \
--admission-control=
Initializers,
NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota \
--runtime-config=api/v1 \
--allow-privileged=true \
--insecure-bind-address=0.0.0.0 \
...
...
test/kubemark/start-kubemark.sh
View file @
4ce39076
...
...
@@ -70,7 +70,7 @@ SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_ARGS:-}"
APISERVER_TEST_ARGS="
${
APISERVER_TEST_ARGS
:-}
"
STORAGE_BACKEND="
${
STORAGE_BACKEND
:-}
"
NUM_NODES="
${
NUM_NODES
:-}
"
CUSTOM_ADMISSION_PLUGINS="
${
CUSTOM_ADMISSION_PLUGINS
:-
NamespaceLifecycle
,LimitRanger,ServiceAccount,ResourceQuota
}
"
CUSTOM_ADMISSION_PLUGINS="
${
CUSTOM_ADMISSION_PLUGINS
:-
Initializers
,
NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota
}
"
EOF
echo
"Created the environment file for master."
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment