Skip to content

Commit bcbe5ba

Browse files
jdefjdef
committed
Merge pull request #62 from mesosphere/k8sm-v0.7.2-v1.1.3
Kubernetes-Mesos v0.7.2-v1.1.5
2 parents 870f41e + 201df07 commit bcbe5ba

File tree

5 files changed

+452
-1
lines changed

5 files changed

+452
-1
lines changed

‎repo/meta/index.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
}
103103
},
104104
{
105-
"currentVersion":"v0.7.1-v1.1.3-alpha",
105+
"currentVersion":"v0.7.2-v1.1.5-alpha",
106106
"description":"Kubernetes is an open source system for managing containerized applications across multiple hosts, providing basic mechanisms for deployment, maintenance, and scaling of applications.",
107107
"framework":true,
108108
"name":"kubernetes",
@@ -117,6 +117,7 @@
117117
"k8s-0.14.2-k8sm-0.5-dcos-20150603T1136520000":"0",
118118
"v0.7.0-v1.1.1-alpha":"3",
119119
"v0.7.1-v1.1.3-alpha":"4",
120+
"v0.7.2-v1.1.5-alpha":"5",
120121
"v1.0.5-v0.6.4-alpha":"1",
121122
"v1.0.6-v0.6.7-alpha":"2"
122123
}

‎repo/packages/K/kubernetes/5/command.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"pip": [
3+
"dcos<1.0",
4+
"git+https://github.com/mesosphere/dcos-kubectl.git#dcos-kubectl=v0.2.2"
5+
]
6+
}

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

+301
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,301 @@
1+
{
2+
"properties": {
3+
"kubernetes": {
4+
"description": "Kubernetes specific configuration properties",
5+
"properties": {
6+
"docker-image": {
7+
"default": "mesosphere/kubernetes:v0.7.2-v1.1.5-alpha",
8+
"description": "Docker image used to launch the Kubernetes framework on DCOS.",
9+
"type": "string"
10+
},
11+
"dns-suffix": {
12+
"default": ".marathon.mesos",
13+
"description": "This value is appended to the framework-name value to form the canonical DNS name for the Kubernetes components.",
14+
"type": "string",
15+
"pattern": "^(?:\\.[a-z][a-z0-9]*?(?:-[a-z0-9]+)*)+$"
16+
},
17+
"enable-dns": {
18+
"default": true,
19+
"description": "Set to true to enable Kubernetes local DNS services, allows pods to locate services by name.",
20+
"type": "boolean"
21+
},
22+
"enable-deployments": {
23+
"default": false,
24+
"description": "Enable deployment experimental feature, not ready for production use.",
25+
"type": "boolean"
26+
},
27+
"enable-daemonsets": {
28+
"default": false,
29+
"description": "Enable daemonset experimental feature, not ready for production use.",
30+
"type": "boolean"
31+
},
32+
"etcd-mesos-framework-name": {
33+
"default": "disabled",
34+
"description": "Which etcd-mesos framework to rely on. Corresponds to the configured framework-name for an etcd-mesos framework. Set this to disabled to use a local etcd instance in the scheduler container.",
35+
"type": "string",
36+
"pattern": "^/?(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])$"
37+
},
38+
"framework-name": {
39+
"default": "kubernetes",
40+
"description": "The framework name to register with Mesos.",
41+
"type": "string",
42+
"pattern": "^/?(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])$"
43+
},
44+
"kube-dns-domain": {
45+
"default": "cluster.local",
46+
"description": "Domain used by pods for Kubernetes service lookup.",
47+
"type": "string",
48+
"pattern": "^(?:[a-z][a-z0-9]*?(?:-[a-z0-9]+)*?\\.)?(?:[a-z][a-z0-9]*?(?:-[a-z0-9]+)*)$"
49+
},
50+
"kube-dns-service-ip": {
51+
"default": "10.10.10.10",
52+
"description": "Kubernetes DNS service portal IP address, should fall in service-cluster-ip-range network range.",
53+
"type": "string",
54+
"pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
55+
},
56+
"kube-dns-replicas": {
57+
"default": 1,
58+
"description": "The number of kube-dns pods that Kubernetes will spin up at deploy time.",
59+
"minimum": 1,
60+
"type": "integer"
61+
},
62+
"kube-dns-nameservers": {
63+
"description": "Comma-delimited list of host:ip entries that point to fallback nameservers. Only used if nameservers cannot be extracted from the slave's /etc/resolv.conf",
64+
"type": "string",
65+
"pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?):(6553[0-5]|655[0-2][0-9]\\d|65[0-4](\\d){2}|6[0-4](\\d){3}|[1-5](\\d){4}|[1-9](\\d){0,3})(?:,(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?):(6553[0-5]|655[0-2][0-9]\\d|65[0-4](\\d){2}|6[0-4](\\d){3}|[1-5](\\d){4}|[1-9](\\d){0,3}))*$"
66+
},
67+
"service-cluster-ip-range": {
68+
"default": "10.10.10.0/24",
69+
"description": "Kubernetes DNS service portal IP address, should fall in service-cluster-ip-range network range.",
70+
"type": "string",
71+
"pattern": "^(?:(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}(?:[0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(?:\\/(?:[0-9]|[1-2][0-9]|3[0-2]))$"
72+
},
73+
"service-node-port-range": {
74+
"description": "A port range to reserve for services with NodePort visibility. Example: '30000-32767'. Inclusive at both ends of the range.",
75+
"type": "string",
76+
"pattern": "^((?:6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{4}|[1-9]\\d{0,3})-(?:6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{4}|[1-9]\\d{0,3})|)$"
77+
},
78+
"scheduler-service-ip": {
79+
"default": "10.10.10.9",
80+
"description": "Kubernetes-Mesos scheduler service portal IP address, should fall in service-cluster-ip-range network range.",
81+
"type": "string",
82+
"pattern": "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
83+
},
84+
"cpus": {
85+
"default": 1.0,
86+
"description": "CPU shares to allocate to each instance.",
87+
"minimum": 0.0,
88+
"type": "number"
89+
},
90+
"failover-timeout": {
91+
"default": 604800,
92+
"description": "The failover_timeout for Mesos in seconds. If a new Kubernetes scheduler instance has not re-registered with Mesos this long after a failover, Mesos will shut down all running pods. Requires checkpointing to be enabled.",
93+
"minimum": 0,
94+
"type": "integer"
95+
},
96+
"apiserver-port": {
97+
"default": 25503,
98+
"description": "Read/write host port that the Kubernetes apiserver listens on.",
99+
"minimum": 1,
100+
"maximum": 65535,
101+
"type": "integer"
102+
},
103+
"apiserver-proxy-port": {
104+
"default": 25500,
105+
"description": "Read/write host port that the Kubernetes nginx proxy in front of the apiserver listens on.",
106+
"minimum": 1,
107+
"maximum": 65535,
108+
"type": "integer"
109+
},
110+
"apiserver-secure-port": {
111+
"default": 25502,
112+
"description": "The Kubernetes apiserver port from which to serve HTTPS with authentication and authorization.",
113+
"minimum": 1,
114+
"maximum": 65535,
115+
"type": "integer"
116+
},
117+
"scheduler-driver-port": {
118+
"default": 25501,
119+
"description": "Host port that the Kubernetes-Mesos scheduler driver listens on.",
120+
"minimum": 1,
121+
"maximum": 65535,
122+
"type": "integer"
123+
},
124+
"scheduler-port": {
125+
"default": 25504,
126+
"description": "Host port that the Kubernetes scheduler listens on.",
127+
"minimum": 1,
128+
"maximum": 65535,
129+
"type": "integer"
130+
},
131+
"controller-manager-port": {
132+
"default": 25505,
133+
"description": "Host port that the Kubernetes controller-manager listens on.",
134+
"minimum": 1,
135+
"maximum": 65535,
136+
"type": "integer"
137+
},
138+
"instances": {
139+
"default": 1,
140+
"description": "Number of Kubernetes scheduler instances to run.",
141+
"minimum": 0,
142+
"maximum": 1,
143+
"type": "integer"
144+
},
145+
"logging-verbosity": {
146+
"default": 1,
147+
"description": "Increase this value to obtain more detailed log messages.",
148+
"type": "integer",
149+
"minimum": 0
150+
},
151+
"mem": {
152+
"default": 768.0,
153+
"description": "Memory (MB) to allocate to each Kubernetes scheduler instance.",
154+
"minimum": 128.0,
155+
"type": "number"
156+
},
157+
"default-container-cpu-limit": {
158+
"default": 0.25,
159+
"description": "CPU shared to allocate to a container in a pod which is not CPU limited.",
160+
"minimum": 0.01,
161+
"type": "number"
162+
},
163+
"default-container-mem-limit": {
164+
"default": 64.0,
165+
"description": "Memory (MB) to allocate to a container in a pod which is not memory limited.",
166+
"minimum": 32.0,
167+
"type": "number"
168+
},
169+
"initial-executor-cpus": {
170+
"default": 0.25,
171+
"description": "Initial CPU shares allocated for the executor container.",
172+
"minimum": 0.01,
173+
"type": "number"
174+
},
175+
"initial-executor-mem": {
176+
"default": 128.0,
177+
"description": "Initial memory (MB) allocated for the executor container.",
178+
"minimum": 128.0,
179+
"type": "number"
180+
},
181+
"framework-roles": {
182+
"default": "*,slave_public",
183+
"description": "Mesos framework roles that the scheduler receives offers for. Currently only * and optionally one additional role are supported.",
184+
"type": "string",
185+
"pattern": "^([\\w*]+)(,[\\w*]+)*$"
186+
},
187+
"default-pod-roles": {
188+
"default": "*",
189+
"description": "Roles that will be used to launch pods having no k8s.mesosphere.io/roles label.",
190+
"type": "string",
191+
"pattern": "^([\\w*]+)(,[\\w*]+)*$"
192+
},
193+
"uris": {
194+
"default": [],
195+
"description": "List of URIs that will be download and made available in the current working directory of the scheduler.",
196+
"items": {
197+
"pattern": "^[^\\s]+",
198+
"type": "string"
199+
},
200+
"type": "array"
201+
},
202+
"debug": {
203+
"default": false,
204+
"description": "Enable debug output",
205+
"type": "boolean"
206+
},
207+
"generate-task-discovery": {
208+
"default": false,
209+
"description": "Generate Mesos task discovery information to be used by systems like mesos-dns.",
210+
"type": "boolean"
211+
},
212+
"proxy-mode": {
213+
"default": "userspace",
214+
"description": "Which proxy mode to use: 'userspace' (older) or 'iptables' (faster). If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are insufficient, this always falls back to the userspace proxy.",
215+
"type": "string",
216+
"pattern": "^(userspace|iptables)$"
217+
},
218+
"pki": {
219+
"description": "Kubernetes certificates and private key configuration.",
220+
"properties": {
221+
"apiserver-crt": {
222+
"default": "disabled",
223+
"description": "Base64 encoded blob containing a x509 Certificate for HTTPS. (CA cert, if any, concatenated after server cert).",
224+
"type": "string"
225+
},
226+
"apiserver-key": {
227+
"default": "disabled",
228+
"description": "Base64 encoded blob containing a x509 private key matching apiserver-crt.",
229+
"type": "string"
230+
},
231+
"root-ca-crt": {
232+
"default": "disabled",
233+
"description": "Base64 encoded blob containing the root certificate authority that will be included in service account's token secret. This must be a valid PEM-encoded CA bundle.",
234+
"type": "string"
235+
},
236+
"service-accounts-key": {
237+
"default": "disabled",
238+
"description": "Base64 encoded blob containing a PEM-encoded private RSA key used to sign service account tokens.",
239+
"type": "string"
240+
}
241+
},
242+
"required": [ "root-ca-crt", "apiserver-crt", "apiserver-key", "service-accounts-key" ],
243+
"type": "object"
244+
}
245+
},
246+
"required": [
247+
"enable-deployments",
248+
"enable-daemonsets",
249+
"etcd-mesos-framework-name",
250+
"framework-name",
251+
"cpus",
252+
"dns-suffix",
253+
"instances",
254+
"failover-timeout",
255+
"logging-verbosity",
256+
"mem",
257+
"uris"
258+
],
259+
"type": "object"
260+
},
261+
"marathon": {
262+
"description": "Marathon specific configuration properties",
263+
"properties": {
264+
"labels": {
265+
"default": {},
266+
"description": "Set of labels to be applied to the Kubernetes Marathon application instance.",
267+
"type": "object"
268+
},
269+
"resource-roles": {
270+
"default": ["*"],
271+
"description": "List of acceptable Mesos resource roles to consider when scheduling the Kubernetes Marathon container. Set to ['slave_public'] to force running Kubernetes on a public slave.",
272+
"items": {
273+
"pattern": "^[^\\s]+$",
274+
"type": "string"
275+
},
276+
"type": "array"
277+
}
278+
},
279+
"required": ["labels","resource-roles"],
280+
"type": "object"
281+
},
282+
"mesos": {
283+
"description": "Mesos specific configuration properties",
284+
"properties": {
285+
"master": {
286+
"default": "zk://master.mesos:2181/mesos",
287+
"description": "The URL of the Mesos master. The format is a comma-delimited list of hosts like zk://host1:port,host2:port/mesos. If using ZooKeeper, pay particular attention to the leading zk:// and trailing /mesos! If not using ZooKeeper, standard host:port patterns, like localhost:5050 or 10.0.0.5:5050,10.0.0.6:5050, are also acceptable.",
288+
"type": "string"
289+
}
290+
},
291+
"required": ["master"],
292+
"type": "object"
293+
}
294+
},
295+
"required": [
296+
"kubernetes",
297+
"marathon",
298+
"mesos"
299+
],
300+
"type": "object"
301+
}

0 commit comments

Comments
 (0)