From f1fed3bcfcff57e522d0ca90c80d95c886ce5119 Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Mon, 5 Jan 2015 16:26:28 -0800 Subject: [PATCH] Remove support for building "run containers". This was untested, broken and largely unused. Related to #12 and #2455#issuecomment-68803245. --- build/README.md | 16 --- build/common.sh | 97 ------------------- build/make-run-images.sh | 34 ------- build/release.sh | 1 - build/run-images/apiserver/Dockerfile | 25 ----- build/run-images/apiserver/run.sh | 17 ---- build/run-images/base/Dockerfile | 23 ----- build/run-images/bootstrap/Dockerfile | 22 ----- build/run-images/bootstrap/run.sh | 56 ----------- .../run-images/controller-manager/Dockerfile | 24 ----- build/run-images/controller-manager/run.sh | 21 ---- build/run-images/kubelet/Dockerfile | 24 ----- build/run-images/kubelet/run.sh | 17 ---- build/run-images/proxy/Dockerfile | 24 ----- build/run-images/proxy/run.sh | 17 ---- build/run-images/scheduler/Dockerfile | 24 ----- build/run-images/scheduler/run.sh | 17 ---- 17 files changed, 459 deletions(-) delete mode 100755 build/make-run-images.sh delete mode 100644 build/run-images/apiserver/Dockerfile delete mode 100755 build/run-images/apiserver/run.sh delete mode 100644 build/run-images/base/Dockerfile delete mode 100644 build/run-images/bootstrap/Dockerfile delete mode 100755 build/run-images/bootstrap/run.sh delete mode 100644 build/run-images/controller-manager/Dockerfile delete mode 100755 build/run-images/controller-manager/run.sh delete mode 100644 build/run-images/kubelet/Dockerfile delete mode 100755 build/run-images/kubelet/run.sh delete mode 100644 build/run-images/proxy/Dockerfile delete mode 100755 build/run-images/proxy/run.sh delete mode 100644 build/run-images/scheduler/Dockerfile delete mode 100755 build/run-images/scheduler/run.sh diff --git a/build/README.md b/build/README.md index ff53168a37..b583f3ba32 100644 --- a/build/README.md +++ b/build/README.md @@ -55,7 +55,6 @@ Env Variable | Default | Description `KUBE_GCS_RELEASE_PREFIX` | `devel` | The path under the release bucket to put releases `KUBE_GCS_MAKE_PUBLIC` | `y` | Make GCS links readable from anywhere `KUBE_GCS_NO_CACHING` | `y` | Disable HTTP caching of GCS release artifacts. By default GCS will cache public objects for up to an hour. When doing "devel" releases this can cause problems. -`KUBE_BUILD_RUN_IMAGES` | `n` | *Experimental* Build Docker images for running most server components. `KUBE_GCS_DOCKER_REG_PREFIX` | `docker-reg` | *Experimental* When uploading docker images, the bucket that backs the registry. ## Basic Flow @@ -68,25 +67,10 @@ Everything in `build/build-image/` is meant to be run inside of the container. When building final release tars, they are first staged into `_output/release-stage` before being tar'd up and put into `_output/release-tars`. -## Runtime Docker Images - -This support is experimental and hasn't been used yet to deploy a cluster. - -The files necessarily for the release Docker images are in `build/run-images/*`. All of this is staged into `_output/images` similar to build-image. The `base` image is used as a base for each of the specialized containers and is generally never pushed to a shared repository. - -If the release script is set to upload to GCS, it'll do the following: -* Start up a local `google/docker-registry` registry that is backed by GCS. -* Rename/push the runtime images to that registry. - ## TODOs These are in no particular order * [X] Harmonize with scripts in `hack/`. How much do we support building outside of Docker and these scripts? -* [ ] Get a cluster up and running with the Docker images. Perhaps start with a local cluster and move up to a GCE cluster. -* [ ] Implement (#186)[https://github.com/GoogleCloudPlatform/kubernetes/issues/186]. This will make it easier to develop Kubernetes. * [X] Deprecate/replace most of the stuff in the hack/ -* [ ] Create an install script that'll let us do a `curl https://[URL] | bash` to get that tarball down and ensure that other dependencies (cloud SDK?) are installed and configured correctly. -* [ ] Support/test Windows as a client. * [ ] Finish support for the Dockerized runtime. Issue (#19)[https://github.com/GoogleCloudPlatform/kubernetes/issues/19]. A key issue here is to make this fast/light enough that we can use it for development workflows. -* [ ] Support uploading to the Docker index instead of the GCS bucket. This'll allow easier installs for those not running on GCE diff --git a/build/common.sh b/build/common.sh index ff426c1ef2..5b87c9e105 100644 --- a/build/common.sh +++ b/build/common.sh @@ -34,7 +34,6 @@ source hack/lib/init.sh # Incoming options # readonly KUBE_SKIP_CONFIRMATIONS="${KUBE_SKIP_CONFIRMATIONS:-n}" -readonly KUBE_BUILD_RUN_IMAGES="${KUBE_BUILD_RUN_IMAGES:-n}" readonly KUBE_GCS_UPLOAD_RELEASE="${KUBE_GCS_UPLOAD_RELEASE:-n}" readonly KUBE_GCS_NO_CACHING="${KUBE_GCS_NO_CACHING:-y}" readonly KUBE_GCS_MAKE_PUBLIC="${KUBE_GCS_MAKE_PUBLIC:-y}" @@ -86,18 +85,6 @@ readonly DOCKER_DATA_MOUNT_ARGS=( --volume "${REMOTE_GODEP_GOPATH}" ) - -readonly KUBE_RUN_IMAGE_BASE="kubernetes" -readonly KUBE_RUN_IMAGES=( - kube-apiserver - kube-controller-manager - kube-proxy - kube-scheduler - kubelet - bootstrap -) - - # This is where the final release artifacts are created locally readonly RELEASE_STAGE="${LOCAL_OUTPUT_ROOT}/release-stage" readonly RELEASE_DIR="${LOCAL_OUTPUT_ROOT}/release-tars" @@ -317,30 +304,6 @@ function kube::build::build_image_cross() { kube::build::docker_build "${KUBE_BUILD_IMAGE_CROSS}" "${build_context_dir}" } -# Builds the runtime image. Assumes that the appropriate binaries are already -# built and in $LOCAL_OUTPUT_BINPATH. -function kube::build::run_image() { - [[ ${KUBE_BUILD_RUN_IMAGES} =~ ^[yY]$ ]] || return 0 - - local -r build_context_base="${LOCAL_OUTPUT_IMAGE_STAGING}/${KUBE_RUN_IMAGE_BASE}" - - # First build the base image. This one brings in all of the binaries. - mkdir -p "${build_context_base}" - tar czf "${build_context_base}/kube-bins.tar.gz" \ - -C "${LOCAL_OUTPUT_BINPATH}/linux/amd64" \ - "${KUBE_RUN_IMAGES[@]}" - cp -R build/run-images/base/* "${build_context_base}/" - kube::build::docker_build "${KUBE_RUN_IMAGE_BASE}" "${build_context_base}" - - local b - for b in "${KUBE_RUN_IMAGES[@]}" ; do - local sub_context_dir="${build_context_base}-$b" - mkdir -p "${sub_context_dir}" - cp -R build/run-images/$b/* "${sub_context_dir}/" - kube::build::docker_build "${KUBE_RUN_IMAGE_BASE}-$b" "${sub_context_dir}" - done -} - # Build a docker image from a Dockerfile. # $1 is the name of the image to build # $2 is the location of the "context" directory, with the Dockerfile at the root. @@ -376,13 +339,6 @@ function kube::build::clean_image() { function kube::build::clean_images() { kube::build::clean_image "${KUBE_BUILD_IMAGE}" - kube::build::clean_image "${KUBE_RUN_IMAGE_BASE}" - - local b - for b in "${KUBE_RUN_IMAGES[@]}" ; do - kube::build::clean_image "${KUBE_RUN_IMAGE_BASE}-${b}" - done - echo "+++ Cleaning all other untagged docker images" "${DOCKER[@]}" rmi $("${DOCKER[@]}" images -q --filter 'dangling=true') 2> /dev/null || true } @@ -734,59 +690,6 @@ function kube::release::gcs::ensure_release_bucket() { fi } -function kube::release::gcs::ensure_docker_registry() { - local -r reg_container_name="gcs-registry" - - local -r running=$("${DOCKER[@]}" inspect ${reg_container_name} 2>/dev/null \ - | build/json-extractor.py 0.State.Running 2>/dev/null) - - [[ "$running" != "true" ]] || return 0 - - # Grovel around and find the OAuth token in the gcloud config - local -r boto=~/.config/gcloud/legacy_credentials/${GCLOUD_ACCOUNT}/.boto - local refresh_token - refresh_token=$(grep 'gs_oauth2_refresh_token =' "$boto" | awk '{ print $3 }') - - if [[ -z "$refresh_token" ]]; then - echo "Couldn't find OAuth 2 refresh token in ${boto}" >&2 - return 1 - fi - - # If we have an old one sitting around, remove it - "${DOCKER[@]}" rm ${reg_container_name} >/dev/null 2>&1 || true - - echo "+++ Starting GCS backed Docker registry" - local -ra docker_cmd=( - "${DOCKER[@]}" run -d "--name=${reg_container_name}" - -e "GCS_BUCKET=${KUBE_GCS_RELEASE_BUCKET}" - -e "STORAGE_PATH=${KUBE_GCS_DOCKER_REG_PREFIX}" - -e "GCP_OAUTH2_REFRESH_TOKEN=${refresh_token}" - -p 127.0.0.1:5000:5000 - google/docker-registry - ) - - "${docker[@]}" - - # Give it time to spin up before we start throwing stuff at it - sleep 5 -} - -function kube::release::gcs::push_images() { - [[ ${KUBE_BUILD_RUN_IMAGES} =~ ^[yY]$ ]] || return 0 - - kube::release::gcs::ensure_docker_registry - - # Tag each of our run binaries with the right registry and push - local b image_name - for b in "${KUBE_RUN_IMAGES[@]}" ; do - image_name="${KUBE_RUN_IMAGE_BASE}-${b}" - echo "+++ Tagging and pushing ${image_name} to GCS bucket ${KUBE_GCS_RELEASE_BUCKET}" - "${DOCKER[@]}" tag "${KUBE_RUN_IMAGE_BASE}-$b" "localhost:5000/${image_name}" - "${DOCKER[@]}" push "localhost:5000/${image_name}" - "${DOCKER[@]}" rmi "localhost:5000/${image_name}" - done -} - function kube::release::gcs::copy_release_artifacts() { # TODO: This isn't atomic. There will be points in time where there will be # no active release. Also, if something fails, the release could be half- diff --git a/build/make-run-images.sh b/build/make-run-images.sh deleted file mode 100755 index 527fd4b274..0000000000 --- a/build/make-run-images.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -# Build the docker image necessary for running Kubernetes -# -# This script will make the 'run image' after building all of the necessary -# binaries. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. -KUBE_BUILD_RUN_IMAGES=y -source "$KUBE_ROOT/build/common.sh" - -kube::build::verify_prereqs -kube::build::build_image -kube::build::run_build_command build/build-image/make-binaries.sh "$@" -kube::build::copy_output -kube::build::run_image diff --git a/build/release.sh b/build/release.sh index 2898072c30..0a4b1daf07 100755 --- a/build/release.sh +++ b/build/release.sh @@ -37,6 +37,5 @@ if [[ $KUBE_RELEASE_RUN_TESTS =~ ^[yY]$ ]]; then fi kube::build::copy_output -kube::build::run_image kube::release::package_tarballs kube::release::gcs::release diff --git a/build/run-images/apiserver/Dockerfile b/build/run-images/apiserver/Dockerfile deleted file mode 100644 index 03db74f61f..0000000000 --- a/build/run-images/apiserver/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM kubernetes -MAINTAINER Joe Beda - -ENV ETCD_SERVERS http://127.0.0.1:4001 -ENV KUBE_MINIONS "" - -ADD . /kubernetes - -CMD ["/kubernetes/run.sh"] diff --git a/build/run-images/apiserver/run.sh b/build/run-images/apiserver/run.sh deleted file mode 100755 index 0440327a4f..0000000000 --- a/build/run-images/apiserver/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -./kube-apiserver -address=0.0.0.0 -etcd_servers="${ETCD_SERVERS}" diff --git a/build/run-images/base/Dockerfile b/build/run-images/base/Dockerfile deleted file mode 100644 index 56c6cb568c..0000000000 --- a/build/run-images/base/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM google/debian:wheezy -MAINTAINER Joe Beda - -WORKDIR /kubernetes - -# Upload Kubernetes server binaries -ADD kube-bins.tar.gz /kubernetes diff --git a/build/run-images/bootstrap/Dockerfile b/build/run-images/bootstrap/Dockerfile deleted file mode 100644 index 4b952e8f2f..0000000000 --- a/build/run-images/bootstrap/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM kubernetes -MAINTAINER Johan Euphrosine - -ADD . /kubernetes - -CMD ["/kubernetes/run.sh"] diff --git a/build/run-images/bootstrap/run.sh b/build/run-images/bootstrap/run.sh deleted file mode 100755 index f4e6fdda1e..0000000000 --- a/build/run-images/bootstrap/run.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -# see https://github.com/docker/docker/issues/8395 -HOST_IP=$(ip route show 0.0.0.0/0 | grep -Eo 'via \S+' | awk '{ print $2 }') - -KUBELET_IP=$(hostname -i) - -cat < pod.yaml -version: v1beta1 -id: cluster-pod -containers: - - name: etcd - image: coreos/etcd - command: ["-vv"] - ports: - - name: etcd-port - hostPort: 4001 - containerPort: 4001 - protocol: TCP - - name: kube-apiserver - image: kubernetes - imagePullPolicy: never - ports: - - name: kube-apiserver-port - hostPort: 8080 - containerPort: 8080 - protocol: TCP - command: ["/kubernetes/kube-apiserver", "-v=5", "-address=0.0.0.0", "-etcd_servers=http://127.0.0.1:4001"] - - name: controller-manager - image: kubernetes - imagePullPolicy: never - command: ["/kubernetes/kube-controller-manager", "-v=5", "-master=127.0.0.1:8080", "-machines=${KUBELET_IP}"] - - name: proxy - image: kubernetes - imagePullPolicy: never - command: ["/kubernetes/kube-proxy", "-v=5", "-etcd_servers=http://127.0.0.1:4001"] - - name: scheduler - image: kubernetes - imagePullPolicy: never - command: ["/kubernetes/kube-scheduler", "-v=5", "-master=127.0.0.1:8080"] -EOF -./kubelet -v=5 -address=0.0.0.0 -hostname_override=${KUBELET_IP} -etcd_servers=http://${HOST_IP}:4001 -config pod.yaml diff --git a/build/run-images/controller-manager/Dockerfile b/build/run-images/controller-manager/Dockerfile deleted file mode 100644 index 416369d0ba..0000000000 --- a/build/run-images/controller-manager/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM kubernetes -MAINTAINER Joe Beda - -ENV API_SERVER 127.0.0.1:8080 - -ADD . /kubernetes - -CMD ["/kubernetes/run.sh"] diff --git a/build/run-images/controller-manager/run.sh b/build/run-images/controller-manager/run.sh deleted file mode 100755 index 80cd6e0638..0000000000 --- a/build/run-images/controller-manager/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -# If the user doesn't specify a minion, assume we are running in a single node -# configuration and that we have a local minion. -KUBE_MINIONS="${KUBE_MINIONS:-$(hostname -f)}" - -./kube-controller-manager -master="${API_SERVER}" --machines="${KUBE_MINIONS}" diff --git a/build/run-images/kubelet/Dockerfile b/build/run-images/kubelet/Dockerfile deleted file mode 100644 index 1c56038553..0000000000 --- a/build/run-images/kubelet/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM kubernetes -MAINTAINER Joe Beda - -ENV ETCD_SERVERS http://127.0.0.1:4001 - -ADD . /kubernetes - -CMD ["/kubernetes/run.sh"] diff --git a/build/run-images/kubelet/run.sh b/build/run-images/kubelet/run.sh deleted file mode 100755 index 6ceace6ffb..0000000000 --- a/build/run-images/kubelet/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -./kubelet -etcd_servers="${ETCD_SERVERS}" diff --git a/build/run-images/proxy/Dockerfile b/build/run-images/proxy/Dockerfile deleted file mode 100644 index 1c56038553..0000000000 --- a/build/run-images/proxy/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM kubernetes -MAINTAINER Joe Beda - -ENV ETCD_SERVERS http://127.0.0.1:4001 - -ADD . /kubernetes - -CMD ["/kubernetes/run.sh"] diff --git a/build/run-images/proxy/run.sh b/build/run-images/proxy/run.sh deleted file mode 100755 index b8bd69279c..0000000000 --- a/build/run-images/proxy/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -./kube-proxy --etcd_servers="${ETCD_SERVERS}" diff --git a/build/run-images/scheduler/Dockerfile b/build/run-images/scheduler/Dockerfile deleted file mode 100644 index 416369d0ba..0000000000 --- a/build/run-images/scheduler/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2014 Google Inc. 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. - -# This file creates a minimal container for running Kubernetes binaries - -FROM kubernetes -MAINTAINER Joe Beda - -ENV API_SERVER 127.0.0.1:8080 - -ADD . /kubernetes - -CMD ["/kubernetes/run.sh"] diff --git a/build/run-images/scheduler/run.sh b/build/run-images/scheduler/run.sh deleted file mode 100755 index fd7112759c..0000000000 --- a/build/run-images/scheduler/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Copyright 2014 Google Inc. 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. - -./kube-scheduler -master="${API_SERVER}"