Merge pull request #13421 from mesosphere/optout_pod_resource_constraints

MESOS: Add --contain-pod-resources flag to determine how k8s-mesos will contain pod resources
This commit is contained in:
Piotr Szczesniak
2015-09-04 13:43:22 +02:00
14 changed files with 517 additions and 233 deletions

View File

@@ -1,5 +1,6 @@
accept-hosts
accept-paths
account-for-pod-resources
admission-control
admission-control-config-file
advertise-address
@@ -43,6 +44,7 @@ cluster-name
cluster-tag
concurrent-endpoint-syncs
configure-cbr0
contain-pod-resources
container-port
container-runtime
cors-allowed-origins
@@ -264,4 +266,4 @@ whitelist-override-label
www-prefix
retry_time
file_content_in_loop
cpu-cfs-quota
cpu-cfs-quota