Add docker-compose cluster that runs with mesos

cluster/mesos/docker/.gitignore

+certs

cluster/mesos/docker/common/bin/await-file

+#!/usr/bin/env bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Wait for a file to exist in the filesystem.
+# Block up to the timeout duration in seconds (default: 10).
+# Usage: await-health-check [-t=<duration>] <address>
+# Requires: timeout, file
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+duration=10
+if [[ "${1:-}" == "-t="* ]]; then
+    duration="${1:3}"
+    [ -z "${duration}" ] && echo "Invalid duration supplied" && exit 1
+    shift
+fi
+
+file="$1"
+[ -z "$file" ] && echo "No file supplied" && exit 1
+
+echo "Waiting (up to ${duration}s) for ${file} to exist"
+if ! timeout "${duration}" bash -c "while [ ! -f \"${file}\" ]; do sleep 0.5; done"; then
+    echo "Timed out"
+    exit 1
+fi
+
+echo "File ${file} exists now!"

cluster/mesos/docker/common/bin/await-health-check

+#!/usr/bin/env bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Wait for a service to accept connections.
+# Block up to the timeout duration in seconds (default: 10).
+# Usage: await-health-check [-t=<duration>] <address>
+# Requires: timeout, health-check
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+duration=10
+if [[ "${1:-}" == "-t="* ]]; then
+    duration="${1:3}"
+    [ -z "${duration}" ] && echo "Invalid duration supplied" && exit 1
+    shift
+fi
+
+address=${1:-}
+[ -z "${address}" ] && echo "No address supplied" && exit 1
+
+bin=$(cd $(dirname $0) && pwd -P)
+
+echo "Waiting (up to ${duration}s) for ${address} to be healthy"
+if ! timeout "${duration}" bash -c "while ! ${bin}/health-check ${address}; do sleep 0.5; done"; then
+    echo "Timed out"
+    exit 1
+fi
+
+echo "Health check of ${address} succeeded!"

cluster/mesos/docker/common/bin/health-check

+#!/usr/bin/env bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Curl an endpoint and expect it to respond with status 200.
+# Usage: health-check <address>
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+address=${1:-}
+[ -z "${address}" ] && echo "No address supplied" && exit 1
+
+status=$(curl -s -o /dev/null -w '%{http_code}' ${address})
+if [[ "${status}" == '200' ]]; then
+    exit 0
+fi
+if [[ "${status}" == '000' ]]; then
+    exit 7
+fi
+
+exit 1

cluster/mesos/docker/common/bin/resolveip

+#!/usr/bin/env bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Resolve an IP from a hostname (using getent)
+# Usage: resolveip <hostname>
+# Requires: getent
+# TODO: Mac support
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+hostname=$1
+[ -z "${hostname}" ] && echo "No hostname supplied" && exit 1
+
+getent hosts "${hostname}" | cut -d' ' -f1 | sort -u | tail -1

cluster/mesos/docker/config-default.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## Contains configuration values for interacting with the mesos/docker cluster
+
+NUM_MINIONS=${NUM_MINIONS:-2}
+INSTANCE_PREFIX="${INSTANCE_PREFIX:-kubernetes}"
+MASTER_NAME="${INSTANCE_PREFIX}-master"
+MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}}))
+
+SERVICE_CLUSTER_IP_RANGE=10.10.10.0/24
+
+# Extra options to set on the Docker command line.  This is useful for setting
+# --insecure-registry for local registries.
+DOCKER_OPTS=""
+
+# Optional: Deploy cluster DNS.
+#ENABLE_CLUSTER_DNS=false
+ENABLE_CLUSTER_DNS=true
+DNS_SERVER_IP="10.10.10.10"
+DNS_DOMAIN="cluster.local"
+DNS_REPLICAS=1
+
+# Optional: Deploy cluster web interface.
+ENABLE_CLUSTER_UI=true

cluster/mesos/docker/config-test.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## Contains configuration values for interacting with the docker-compose cluster in test mode
+#Set NUM_MINIONS to minimum required for testing.
+NUM_MINIONS=2
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../..
+source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/config-default.sh"

cluster/mesos/docker/deploy-addons.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Deploy the addon services after the cluster is available
+# TODO: integrate with or use /cluster/saltbase/salt/kube-addons/kube-addons.sh
+# Requires:
+#   ENABLE_CLUSTER_DNS (Optional) - 'Y' to deploy kube-dns
+#   KUBE_SERVER (Optional) - url to the api server for configuring kube-dns
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(cd "$(dirname "${BASH_SOURCE}")/../../.." && pwd)
+source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/${KUBE_CONFIG_FILE-"config-default.sh"}"
+source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util-temp-dir.sh"
+kubectl="${KUBE_ROOT}/cluster/kubectl.sh"
+
+
+function deploy_dns {
+  echo "Deploying DNS Addon" 1>&2
+  local workspace=$(pwd)
+
+  # Process salt pillar templates manually
+  sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.in" > "${workspace}/skydns-rc.yaml"
+  sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-svc.yaml.in" > "${workspace}/skydns-svc.yaml"
+
+  # Use kubectl to create skydns rc and service
+  "${kubectl}" create -f "${workspace}/skydns-rc.yaml"
+  "${kubectl}" create -f "${workspace}/skydns-svc.yaml"
+}
+
+function deploy_ui {
+  echo "Deploying UI Addon" 1>&2
+
+  # Use kubectl to create ui rc and service
+  "${kubectl}" create -f "${KUBE_ROOT}/cluster/addons/kube-ui/kube-ui-rc.yaml"
+  "${kubectl}" create -f "${KUBE_ROOT}/cluster/addons/kube-ui/kube-ui-svc.yaml"
+}
+
+# create the kube-system namespace
+"${kubectl}" create -f "${KUBE_ROOT}/cluster/mesos/docker/kube-system-ns.yaml"
+
+if [ "${ENABLE_CLUSTER_DNS}" == true ]; then
+  cluster::mesos::docker::run_in_temp_dir 'k8sm-dns' 'deploy_dns'
+fi
+
+if [ "${ENABLE_CLUSTER_UI}" == true ]; then
+  deploy_ui
+fi

cluster/mesos/docker/docker-compose.yml

+ambassador:
+  image: cpuguy83/docker-grand-ambassador:0.9.1
+  volumes:
+  - /var/run/docker.sock:/var/run/docker.sock
+  command: "-name docker_apiserver_1"
+etcd:
+  hostname: etcd
+  image: quay.io/coreos/etcd:v2.0.12
+  ports: [ "4001:4001" ]
+  command: >
+    --listen-client-urls 'http://etcd:4001'
+    --advertise-client-urls 'http://etcd:4001'
+    --initial-cluster-state new
+mesosmaster1:
+  hostname: mesosmaster1
+  image: mesosphere/mesos:0.22.0-1.0.ubuntu1404
+  entrypoint: [ "mesos-master" ]
+  ports: [ "5050:5050" ]
+  environment:
+  - MESOS_HOSTNAME=mesosmaster1
+  - MESOS_PORT=5050
+  - MESOS_LOG_DIR=/var/log/mesos
+  - MESOS_QUORUM=1
+  - MESOS_REGISTRY=in_memory
+  - MESOS_WORK_DIR=/var/lib/mesos
+  links:
+  - etcd
+  - "ambassador:apiserver"
+mesosslave1:
+  hostname: mesosslave1
+  privileged: true
+  image: mesosphere/mesos-slave-dind:0.23.0-1.0.ubuntu1404
+  entrypoint: [ "bash", "-c", "wrapdocker mesos-slave --hostname=$(getent hosts mesosslave1 | cut -d' ' -f1 | sort -u | tail -1)" ]
+  command: ~
+  environment:
+  - MESOS_MASTER=mesosmaster1:5050
+  - MESOS_PORT=5051
+  - MESOS_LOG_DIR=/var/log/mesos
+  - MESOS_LOGGING_LEVEL=INFO
+  - MESOS_RESOURCES=cpus:4;mem:1280;disk:25600;ports:[21000-21099]
+  - MESOS_SWITCH_USER=0
+  - MESOS_CONTAINERIZERS=docker,mesos
+  - DOCKER_NETWORK_OFFSET=0.0.1.0
+  - DOCKER_DAEMON_ARGS=--log-level=error
+  links:
+  - etcd
+  - mesosmaster1
+  - "ambassador:apiserver"
+  volumes:
+  - /var/tmp/mesosslave1:/var/lib/docker
+mesosslave2:
+  hostname: mesosslave2
+  privileged: true
+  image: mesosphere/mesos-slave-dind:0.23.0-1.0.ubuntu1404
+  entrypoint: [ "bash", "-c", "wrapdocker mesos-slave --hostname=$(getent hosts mesosslave2 | cut -d' ' -f1 | sort -u | tail -1)" ]
+  command: ~
+  environment:
+  - MESOS_MASTER=mesosmaster1:5050
+  - MESOS_PORT=5051
+  - MESOS_LOG_DIR=/var/log/mesos
+  - MESOS_LOGGING_LEVEL=INFO
+  - MESOS_RESOURCES=cpus:4;mem:1280;disk:25600;ports:[21000-21099]
+  - MESOS_SWITCH_USER=0
+  - MESOS_CONTAINERIZERS=docker,mesos
+  - DOCKER_NETWORK_OFFSET=0.0.2.0
+  - DOCKER_DAEMON_ARGS=--log-level=error
+  links:
+  - etcd
+  - mesosmaster1
+  - "ambassador:apiserver"
+  volumes:
+  - /var/tmp/mesosslave2:/var/lib/docker
+apiserver:
+  hostname: apiserver
+  image: mesosphere/kubernetes-mesos
+  entrypoint:
+  - /bin/bash
+  - "-c"
+  - >
+    echo "Hostname: $(hostname -f) ($(hostname -f | xargs resolveip))" &&
+    (grep "mesos-master\s*=" /opt/mesos-cloud.conf || echo "  mesos-master = mesosmaster1:5050" >> /opt/mesos-cloud.conf) &&
+    await-health-check http://etcd:4001/health &&
+    await-health-check http://mesosmaster1:5050/health &&
+    await-file -t=60 /var/run/kubernetes/auth/apiserver.crt &&
+    km apiserver
+    --address=$(resolveip apiserver)
+    --external-hostname=apiserver
+    --etcd-servers=http://etcd:4001
+    --port=8888
+    --admission-control=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
+    --authorization-mode=AlwaysAllow
+    --token-auth-file=/var/run/kubernetes/auth/token-users
+    --basic-auth-file=/var/run/kubernetes/auth/basic-users
+    --service-account-key-file=/var/run/kubernetes/auth/service-accounts.key
+    --service-cluster-ip-range=10.10.10.0/24
+    --service-node-port-range=30000-32767
+    --cloud-provider=mesos
+    --cloud-config=/opt/mesos-cloud.conf
+    --tls-cert-file=/var/run/kubernetes/auth/apiserver.crt
+    --tls-private-key-file=/var/run/kubernetes/auth/apiserver.key
+    --v=2
+  ports: [ "8888:8888", "6443:6443" ]
+  volumes:
+  - ./certs/apiserver:/var/run/kubernetes/auth
+  links:
+  - etcd
+  - mesosmaster1
+controller:
+  hostname: controller
+  image: mesosphere/kubernetes-mesos
+  entrypoint:
+  - /bin/bash
+  - "-c"
+  - >
+    echo "Hostname: $(hostname -f) ($(hostname -f | xargs resolveip))" &&
+    (grep "mesos-master\s*=" /opt/mesos-cloud.conf || echo "  mesos-master = mesosmaster1:5050" >> /opt/mesos-cloud.conf) &&
+    await-health-check -t=60 http://mesosmaster1:5050/health &&
+    await-health-check -t=60 http://apiserver:8888/healthz &&
+    km controller-manager
+    --master=http://apiserver:8888
+    --cloud-config=/opt/mesos-cloud.conf
+    --service-account-private-key-file=/var/run/kubernetes/auth/service-accounts.key
+    --root-ca-file=/var/run/kubernetes/auth/root-ca.crt
+    --v=2
+  volumes:
+  - ./certs/controller:/var/run/kubernetes/auth
+  links:
+  - mesosmaster1
+  - apiserver
+scheduler:
+  hostname: scheduler
+  image: mesosphere/kubernetes-mesos
+  entrypoint:
+  - /bin/bash
+  - "-c"
+  - >
+    echo "Hostname: $(hostname -f) ($(hostname -f | xargs resolveip))" &&
+    (grep "mesos-master\s*=" /opt/mesos-cloud.conf || echo "  mesos-master = mesosmaster1:5050" >> /opt/mesos-cloud.conf) &&
+    await-health-check http://etcd:4001/health &&
+    await-health-check http://mesosmaster1:5050/health &&
+    await-health-check -t=60 http://apiserver:8888/healthz &&
+    km scheduler
+    --address=$(resolveip scheduler)
+    --hostname-override=scheduler
+    --etcd-servers=http://etcd:4001
+    --mesos-user=root
+    --api-servers=http://apiserver:8888
+    --mesos-master=mesosmaster1:5050
+    --cluster-dns=10.10.10.10
+    --cluster-domain=cluster.local
+    --v=2
+  links:
+  - etcd
+  - mesosmaster1
+  - mesosslave1
+  - mesosslave2
+  - apiserver

cluster/mesos/docker/km/Dockerfile

+FROM ubuntu:14.04.2
+MAINTAINER Mesosphere <support@mesosphere.io>
+
+RUN locale-gen en_US.UTF-8
+RUN dpkg-reconfigure locales
+ENV LANG en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+
+RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy \
+        wget \
+        curl \
+        && \
+    apt-get clean
+
+COPY ./bin/* /usr/local/bin/
+ADD ./opt/mesos-cloud.conf /opt/

cluster/mesos/docker/km/build.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Builds a docker image that contains the kubernetes-mesos binaries.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+IMAGE_REPO=${IMAGE_REPO:-mesosphere/kubernetes-mesos}
+IMAGE_TAG=${IMAGE_TAG:-latest}
+
+script_dir=$(cd $(dirname "${BASH_SOURCE}") && pwd -P)
+KUBE_ROOT=$(cd ${script_dir}/../../../.. && pwd -P)
+
+# Find a platform specific binary, whether it was cross compiled, locally built, or downloaded.
+find-binary() {
+  local lookfor="${1}"
+  local platform="${2}"
+  local locations=(
+    "${KUBE_ROOT}/_output/dockerized/bin/${platform}/${lookfor}"
+    "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}"
+    "${KUBE_ROOT}/platforms/${platform}/${lookfor}"
+  )
+  local bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
+  echo -n "${bin}"
+}
+
+km_path=$(find-binary km linux/amd64)
+if [ -z "$km_path" ]; then
+  echo "Failed to find km binary" 1>&2
+  exit 1
+fi
+kube_bin_path=$(dirname ${km_path})
+common_bin_path=$(cd ${script_dir}/../common/bin && pwd -P)
+
+cd "${KUBE_ROOT}"
+
+# create temp workspace to place compiled binaries with image-specific scripts
+# create temp workspace dir in KUBE_ROOT to avoid permission issues of TMPDIR on mac os x
+workspace=$(env TMPDIR=$PWD mktemp -d -t "k8sm-workspace-XXXXXX")
+echo "Workspace created: ${workspace}"
+
+cleanup() {
+  rm -rf "${workspace}"
+  echo "Workspace deleted: ${workspace}"
+}
+trap 'cleanup' EXIT
+
+# setup workspace to mirror script dir (dockerfile expects /bin & /opt)
+echo "Copying files to workspace"
+
+# binaries & scripts
+mkdir -p "${workspace}/bin"
+#cp "${script_dir}/bin/"* "${workspace}/bin/"
+cp "${common_bin_path}/"* "${workspace}/bin/"
+cp "${kube_bin_path}/"* "${workspace}/bin/"
+
+# config
+mkdir -p "${workspace}/opt"
+cp "${script_dir}/opt/"* "${workspace}/opt/"
+
+# docker
+cp "${script_dir}/Dockerfile" "${workspace}/"
+
+cd "${workspace}"
+
+# build docker image
+echo "Building docker image ${IMAGE_REPO}:${IMAGE_TAG}"
+set -o xtrace
+docker build -t ${IMAGE_REPO}:${IMAGE_TAG} "$@" .
+set +o xtrace
+echo "Built docker image ${IMAGE_REPO}:${IMAGE_TAG}"

cluster/mesos/docker/km/opt/mesos-cloud.conf

+[mesos-cloud]
+  http-client-timeout = 5s
+  state-cache-ttl     = 20s

cluster/mesos/docker/kube-system-ns.yaml

+kind: "Namespace"
+apiVersion: "v1"
+metadata:
+  name: "kube-system"
+  labels:
+    name: "kube-system"
\ No newline at end of file

cluster/mesos/docker/test/Dockerfile

+FROM golang:1.4.2
+MAINTAINER Mesosphere <support@mesosphere.io>
+
+# docker.io is suppossed to be in backports, but it's not there yet.
+# https://github.com/docker/docker/issues/13253
+# http://docs.docker.com/installation/debian/#debian-jessie-80-64-bit
+#RUN echo "deb http://httpredir.debian.org/debian jessie-backports main" >> /etc/apt/sources.list
+#RUN echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list
+
+RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy \
+        wget \
+        curl \
+        g++ \
+        make \
+        mercurial \
+        git \
+        rsync \
+        patch \
+        python \
+        python-pip \
+        apt-transport-https \
+        && \
+    apt-get clean
+
+# Install latest Docker
+# RUN curl -sSL https://get.docker.com/ubuntu/ | sh
+
+# Install Docker 1.6.2 (docker 1.7 has regressions)
+RUN echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list && \
+    apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 && \
+    apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy \
+        lxc-docker-1.6.2 \
+        && \
+    apt-get clean
+
+RUN pip install -U docker-compose
+
+RUN go get github.com/tools/godep
+
+RUN mkdir -p /go/src/github.com/GoogleCloudPlatform/kubernetes
+WORKDIR /go/src/github.com/GoogleCloudPlatform/kubernetes
+
+COPY ./bin/* /usr/local/bin/
+
+RUN install-etcd.sh
+
+ENTRYPOINT [ "bash" ]

cluster/mesos/docker/test/bin/install-etcd.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Installs etcd into /usr/local/bin
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+ETCD_VERSION=${ETCD_VERSION:-v2.0.11}
+
+full_name=etcd-${ETCD_VERSION}-linux-amd64
+archive_url=https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${full_name}.tar.gz
+
+download_dir=/tmp/etcd-${ETCD_VERSION}
+
+mkdir ${download_dir}
+
+function cleanup {
+    rm -rf ${download_dir}
+}
+
+trap cleanup EXIT
+
+cd ${download_dir}
+
+echo "Downloading etcd (${archive_url})..."
+curl -s -L ${archive_url} | tar xvz
+
+echo "Installing etcd (/usr/local/bin/etcd)..."
+mv ./${full_name}/etcd* /usr/local/bin/

cluster/mesos/docker/test/build.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+IMAGE_REPO=${IMAGE_REPO:-mesosphere/kubernetes-mesos-test}
+IMAGE_TAG=${IMAGE_TAG:-latest}
+
+script_dir=$(cd $(dirname "${BASH_SOURCE}") && pwd -P)
+common_bin_path=$(cd ${script_dir}/../common/bin && pwd -P)
+KUBE_ROOT=$(cd ${script_dir}/../../../.. && pwd -P)
+
+cd "${KUBE_ROOT}"
+
+# create temp workspace to place common scripts with image-specific scripts
+# create temp workspace dir in KUBE_ROOT to avoid permission issues of TMPDIR on mac os x
+workspace=$(env TMPDIR=$PWD mktemp -d -t "k8sm-test-workspace-XXXXXX")
+echo "Workspace created: ${workspace}"
+
+cleanup() {
+  rm -rf "${workspace}"
+  echo "Workspace deleted: ${workspace}"
+}
+trap 'cleanup' EXIT
+
+# setup workspace to mirror script dir (dockerfile expects /bin)
+set -x
+echo "Copying files to workspace"
+
+# binaries & scripts
+mkdir -p "${workspace}/bin"
+cp -a "${common_bin_path}/"* "${workspace}/bin/"
+cp -a "${script_dir}/bin/"* "${workspace}/bin/"
+
+# docker
+cp -a "${script_dir}/Dockerfile" "${workspace}/"
+
+cd "${workspace}"
+
+echo "Building docker image ${IMAGE_REPO}:${IMAGE_TAG}"
+set -o xtrace
+docker build -t ${IMAGE_REPO}:${IMAGE_TAG} "$@" .
+set +o xtrace
+echo "Built docker image ${IMAGE_REPO}:${IMAGE_TAG}"

cluster/mesos/docker/util-ssl.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Sourcable SSL functions
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+script_dir=$(cd "$(dirname ${BASH_SOURCE})" && pwd -P)
+source "${script_dir}/util-temp-dir.sh"
+
+function cluster::mesos::docker::find_openssl_config {
+  for candidate in "/etc/ssl/openssl.cnf" "/System/Library/OpenSSL/openssl.cnf"; do
+    if [ -f "${candidate}" ]; then
+      echo "${candidate}"
+      return 0
+    fi
+  done
+  echo "ERROR: cannot find openssl.cnf" 1>&2
+  return 1
+}
+
+function cluster::mesos::docker::create_root_certificate_authority {
+  local certdir="$1"
+
+  openssl req -nodes -newkey rsa:2048 \
+    -keyout "${certdir}/root-ca.key" \
+    -out "${certdir}/root-ca.csr" \
+    -subj "/C=GB/ST=London/L=London/O=example/OU=IT/CN=example.com"
+
+  openssl x509 -req -days 3650 \
+    -in "${certdir}/root-ca.csr" \
+    -out "${certdir}/root-ca.crt" \
+    -signkey "${certdir}/root-ca.key"
+}
+
+# Creates an apiserver key and certificate with the given IPs & kubernetes.* domain names.
+# Uses the current dir for scratch work.
+function cluster::mesos::docker::create_apiserver_cert_inner {
+  local in_dir="$1" # must contain root-ca.crt & root-ca.key
+  local out_dir="$2"
+  local apiserver_ip="$3"
+  local service_ip="$4"
+  local workspace="$(pwd)"
+
+  mkdir -p "${out_dir}"
+
+  local OPENSSL_CNF=$(cluster::mesos::docker::find_openssl_config)
+
+  # create apiserver key and certificate sign request
+  local SANS="IP:${apiserver_ip},IP:${service_ip},DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
+  openssl req -nodes -newkey rsa:2048 \
+    -keyout "${workspace}/apiserver.key" -out "${workspace}/apiserver.csr" \
+    -reqexts SAN -config <(cat "${OPENSSL_CNF}"; echo -e "[SAN]\nsubjectAltName=$SANS") \
+    -subj "/C=GB/ST=London/L=London/O=example/OU=IT/CN=example.com"
+
+  # sign with root-ca
+  mkdir -p ${workspace}/demoCA/newcerts
+  touch ${workspace}/demoCA/index.txt
+  echo 1000 > ${workspace}/demoCA/serial
+  openssl ca -cert "${in_dir}/root-ca.crt" -keyfile "${in_dir}/root-ca.key" \
+    -batch -days 3650 -in "${workspace}/apiserver.csr" \
+    -config <(sed 's/.*\(copy_extensions = copy\)/\1/' ${OPENSSL_CNF}) >/dev/null
+
+  # check certificate for subjectAltName extension
+  if ! openssl x509 -in "${workspace}/demoCA/newcerts/1000.pem" -text -noout | grep -q kubernetes.default.svc.cluster.local; then
+    echo "ERROR: openssl failed to add subjectAltName extension" 1>&2
+    return 1
+  fi
+
+  # write to out_dir
+  cp "${workspace}/demoCA/newcerts/1000.pem" "${out_dir}/apiserver.crt"
+  cp "${workspace}/apiserver.key" "${out_dir}/"
+}
+
+# Creates an apiserver key and certificate with the given IPs & kubernetes.* domain names.
+function cluster::mesos::docker::create_apiserver_cert {
+  local in_dir="$1" # must contain root-ca.crt & root-ca.key
+  local out_dir="$2"
+  local apiserver_ip="$3"
+  local service_ip="$4"
+
+  cluster::mesos::docker::run_in_temp_dir "k8sm-certs" \
+    "cluster::mesos::docker::create_apiserver_cert_inner" \
+      "${in_dir}" "${out_dir}" "${apiserver_ip}" "${service_ip}"
+}
+
+# Creates an rsa key (for signing service accounts).
+function cluster::mesos::docker::create_rsa_key {
+  local key_file_path="$1"
+  openssl genrsa -out "${key_file_path}" 2048
+}
+
+# Creates a k8s token auth user file.
+# See /docs/admin/authentication.md
+function cluster::mesos::docker::create_token_user {
+  local user_name="$1"
+  echo "$(openssl rand -hex 32),${user_name},${user_name}"
+}
+
+# Creates a k8s basic auth user file.
+# See /docs/admin/authentication.md
+function cluster::mesos::docker::create_basic_user {
+  local user_name="$1"
+  local password="$2"
+  echo "${password},${user_name},${user_name}"
+}
\ No newline at end of file

cluster/mesos/docker/util-temp-dir.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Sourcable temp directory functions
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Runs the supplied command string in a temporary workspace directory.
+function cluster::mesos::docker::run_in_temp_dir {
+  prefix="$1"
+  shift
+  cmd="$@"
+
+  # create temp WORKSPACE dir in current dir to avoid permission issues of TMPDIR on mac os x
+  local -r workspace=$(env TMPDIR=$(pwd) mktemp -d -t "${prefix}-XXXXXX")
+  echo "Workspace created: ${workspace}" 1>&2
+
+  cleanup() {
+    rm -rf "${workspace}"
+    echo "Workspace deleted: ${workspace}" 1>&2
+  }
+  trap 'cleanup' EXIT
+
+  pushd "${workspace}" > /dev/null
+  (${cmd}) || return $?
+  popd > /dev/null
+
+  trap - EXIT
+  cleanup
+}
\ No newline at end of file

cluster/test-e2e.sh

+#!/bin/bash
+
+# Copyright 2014 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Tests a running Kubernetes cluster.
+# TODO: move code from hack/ginkgo-e2e.sh to here
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${KUBE_ROOT}/cluster/kube-env.sh"
+
+echo "Testing cluster with provider: ${KUBERNETES_PROVIDER}" 1>&2
+
+TEST_ARGS="$@"
+
+echo "Running e2e tests:" 1>&2
+echo "./hack/ginkgo-e2e.sh ${TEST_ARGS}" 1>&2
+exec "${KUBE_ROOT}/hack/ginkgo-e2e.sh" ${TEST_ARGS}

docs/getting-started-guides/README.md

@@ -144,7 +144,8 @@ Bare-metal           | custom       | Fedora | _none_      | [docs](fedora/fedor
 Bare-metal           | custom       | Fedora | flannel     | [docs](fedora/flannel_multi_node_cluster.md)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
 libvirt              | custom       | Fedora | flannel     | [docs](fedora/flannel_multi_node_cluster.md)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
 KVM                  | custom       | Fedora | flannel     | [docs](fedora/flannel_multi_node_cluster.md)      |          | Community ([@aveshagarwal](https://github.com/aveshagarwal))
-Mesos/GCE            |              |        |             | [docs](mesos.md)                                  |          | [Community](https://github.com/mesosphere/kubernetes-mesos) ([@jdef](https://github.com/jdef))
+Mesos/Docker         | custom       | Ubuntu | Docker      | [docs](mesos-docker.md)                           |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
+Mesos/GCE            |              |        |             | [docs](mesos.md)                                  |          | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md))
 AWS                  | CoreOS       | CoreOS | flannel     | [docs](coreos.md)                                 |          | Community
 GCE                  | CoreOS       | CoreOS | flannel     | [docs](coreos.md)                                 |          | Community [@pires](https://github.com/pires)
 Vagrant              | CoreOS       | CoreOS | flannel     | [docs](coreos.md)                                 |          | Community ( [@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles) )