Skip to content

Commit ed2e73c

Browse files
committed
change scheduler container to run in docker BRIDGE mode; requires upstream PR kubernetes/kubernetes#21612
1 parent ae44193 commit ed2e73c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

repo/packages/K/kubernetes/5/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Kubernetes specific configuration properties",
55
"properties": {
66
"docker-image": {
7-
"default": "mesosphere/kubernetes:v0.7.2-v1.1.5-alpha",
7+
"default": "mesosphere/kubernetes:vagrant-v0.7.2-v1.1.5-dev-alpha",
88
"description": "Docker image used to launch the Kubernetes framework on DCOS.",
99
"type": "string"
1010
},

repo/packages/K/kubernetes/5/marathon.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@
99
"docker": {
1010
"image": "{{kubernetes.docker-image}}",
1111
"forcePullImage": true,
12-
"network": "HOST"
12+
"network": "BRIDGE",
13+
"portMappings": [
14+
{ "containerPort": 0, "hostPort": {{kubernetes.apiserver-proxy-port}}, "protocol": "tcp" },
15+
{ "containerPort": 0, "hostPort": {{kubernetes.apiserver-port}}, "protocol": "tcp" },
16+
{ "containerPort": 0, "hostPort": {{kubernetes.apiserver-secure-port}}, "protocol": "tcp" },
17+
{ "containerPort": 0, "hostPort": {{kubernetes.scheduler-port}}, "protocol": "tcp" },
18+
{ "containerPort": 0, "hostPort": {{kubernetes.controller-manager-port}}, "protocol": "tcp" },
19+
{ "containerPort": 0, "hostPort": {{kubernetes.scheduler-driver-port}}, "protocol": "tcp" }
20+
]
1321
}
1422
},
1523
"env":{
@@ -101,8 +109,6 @@
101109
"SCHEDULER_MESOS_EXECUTOR_CPUS": "{{kubernetes.initial-executor-cpus}}",
102110
"SCHEDULER_MESOS_EXECUTOR_MEM": "{{kubernetes.initial-executor-mem}}"
103111
},
104-
"ports": [{{kubernetes.apiserver-proxy-port}},{{kubernetes.apiserver-port}}, {{kubernetes.apiserver-secure-port}}, {{kubernetes.scheduler-port}}, {{kubernetes.controller-manager-port}}, {{kubernetes.scheduler-driver-port}}],
105-
"requirePorts": true,
106112
"upgradeStrategy":{
107113
"minimumHealthCapacity": 0,
108114
"maximumOverCapacity": 0

0 commit comments

Comments
 (0)