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

fixed conflict resolution behavior while apply podpresets

Browse Source
This commit is contained in:
Sunil Arora
2017-06-20 13:34:19 -07:00
parent ae1ff1a2d4
commit 4d5b96f94e
4 changed files with 299 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/local-up-cluster.sh
View File

@@ -406,7 +406,6 @@ function start_apiserver {
# Admission Controllers to invoke prior to persisting objects in cluster
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