Merge pull request #13943 from mesosphere/static-pods

Auto commit by PR queue bot

cluster/mesos/docker/deploy-addons.sh

@@ -52,8 +52,9 @@ function deploy_ui {
   "${kubectl}" create -f "${KUBE_ROOT}/cluster/addons/kube-ui/kube-ui-svc.yaml"
 }
 
-# create the kube-system namespace
+# create the kube-system and static-pods namespaces
 "${kubectl}" create -f "${KUBE_ROOT}/cluster/mesos/docker/kube-system-ns.yaml"
+"${kubectl}" create -f "${KUBE_ROOT}/cluster/mesos/docker/static-pods-ns.yaml"
 
 if [ "${ENABLE_CLUSTER_DNS}" == true ]; then
   cluster::mesos::docker::run_in_temp_dir 'k8sm-dns' 'deploy_dns'

cluster/mesos/docker/docker-compose.yml

@@ -142,6 +142,7 @@ scheduler:
     --cluster-domain=cluster.local
     --mesos-executor-cpus=1.0
     --mesos-sandbox-overlay=/opt/sandbox-overlay.tar.gz
+    --static-pods-config=/opt/static-pods
     --v=4
     --executor-logv=4
     --profiling=true
@@ -149,6 +150,8 @@ scheduler:
   - etcd
   - mesosmaster1
   - apiserver
+  volumes:
+  - ./static-pod.json:/opt/static-pods/static-pod.json
 keygen:
   image: mesosphere/kubernetes-mesos-keygen
   command:

cluster/mesos/docker/static-pod.json

@@ -0,0 +1,23 @@
+{
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "name": "busybox",
+    "namespace": "static-pods"
+  },
+  "spec": {
+    "containers": [
+      {
+        "image": "busybox",
+        "command": [
+          "sh",
+          "-c",
+	  "exec tail -f /dev/null"
+        ],
+        "imagePullPolicy": "IfNotPresent",
+        "name": "busybox"
+      }
+    ],
+    "restartPolicy": "Always"
+  }
+}

cluster/mesos/docker/static-pods-ns.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: static-pods
+  labels:
+    name: static-pods