Skip to content

Commit

Permalink
Rename build-tools/ back to build/
Browse files Browse the repository at this point in the history
  • Loading branch information
@ixdy
ixdy committed Dec 14, 2016
1 parent 4bcb27e commit 27d096d
Show file tree
Hide file tree
Showing 62 changed files with 71 additions and 71 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ clean:
@echo "$$CLEAN_HELP_INFO"
else
clean: clean_meta
build-tools/make-clean.sh
build/make-clean.sh
rm -rf $(OUT_DIR)
rm -rf Godeps/_workspace # Just until we are sure it is gone
endif
Expand Down Expand Up @@ -342,7 +342,7 @@ release:
@echo "$$RELEASE_HELP_INFO"
else
release:
build-tools/release.sh
build/release.sh
endif

define RELEASE_SKIP_TESTS_HELP_INFO
Expand All @@ -357,7 +357,7 @@ release-skip-tests quick-release:
@echo "$$RELEASE_SKIP_TESTS_HELP_INFO"
else
release-skip-tests quick-release:
KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build-tools/release.sh
KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build/release.sh
endif

define CROSS_HELP_INFO
Expand Down
0 build-tools/BUILD → build/BUILD
View file
File renamed without changes.
0 build-tools/OWNERS → build/OWNERS
View file
File renamed without changes.
28 changes: 14 additions & 14 deletions build-tools/README.md → build/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ While it is possible to build Kubernetes using a local golang installation, we h

## Key scripts

The following scripts are found in the `build-tools/` directory. Note that all scripts must be run from the Kubernetes root directory.

* `build-tools/run.sh`: Run a command in a build docker container. Common invocations:
* `build-tools/run.sh make`: Build just linux binaries in the container. Pass options and packages as necessary.
* `build-tools/run.sh make cross`: Build all binaries for all platforms
* `build-tools/run.sh make test`: Run all unit tests
* `build-tools/run.sh make test-integration`: Run integration test
* `build-tools/run.sh make test-cmd`: Run CLI tests
* `build-tools/copy-output.sh`: This will copy the contents of `_output/dockerized/bin` from the Docker container to the local `_output/dockerized/bin`. It will also copy out specific file patterns that are generated as part of the build process. This is run automatically as part of `build-tools/run.sh`.
* `build-tools/make-clean.sh`: Clean out the contents of `_output`, remove any locally built container images and remove the data container.
* `/build-tools/shell.sh`: Drop into a `bash` shell in a build container with a snapshot of the current repo code.
The following scripts are found in the `build/` directory. Note that all scripts must be run from the Kubernetes root directory.

* `build/run.sh`: Run a command in a build docker container. Common invocations:
* `build/run.sh make`: Build just linux binaries in the container. Pass options and packages as necessary.
* `build/run.sh make cross`: Build all binaries for all platforms
* `build/run.sh make test`: Run all unit tests
* `build/run.sh make test-integration`: Run integration test
* `build/run.sh make test-cmd`: Run CLI tests
* `build/copy-output.sh`: This will copy the contents of `_output/dockerized/bin` from the Docker container to the local `_output/dockerized/bin`. It will also copy out specific file patterns that are generated as part of the build process. This is run automatically as part of `build/run.sh`.
* `build/make-clean.sh`: Clean out the contents of `_output`, remove any locally built container images and remove the data container.
* `/build/shell.sh`: Drop into a `bash` shell in a build container with a snapshot of the current repo code.

## Basic Flow

The scripts directly under `build-tools/` are used to build and test. They will ensure that the `kube-build` Docker image is built (based on `build-tools/build-image/Dockerfile`) and then execute the appropriate command in that container. These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container.
The scripts directly under `build/` are used to build and test. They will ensure that the `kube-build` Docker image is built (based on `build/build-image/Dockerfile`) and then execute the appropriate command in that container. These scripts will both ensure that the right data is cached from run to run for incremental builds and will copy the results back out of the container.

The `kube-build` container image is built by first creating a "context" directory in `_output/images/build-image`. It is done there instead of at the root of the Kubernetes repo to minimize the amount of data we need to package up when building the image.

Expand Down Expand Up @@ -92,7 +92,7 @@ Look at `docker-machine stop`, `docker-machine start` and `docker-machine rm` to

## Releasing

The `build-tools/release.sh` script will build a release. It will build binaries, run tests, (optionally) build runtime Docker images.
The `build/release.sh` script will build a release. It will build binaries, run tests, (optionally) build runtime Docker images.

The main output is a tar file: `kubernetes.tar.gz`. This includes:
* Cross compiled client utilities.
Expand All @@ -109,4 +109,4 @@ In addition, there are some other tar files that are created:

When building final release tars, they are first staged into `_output/release-stage` before being tar'd up and put into `_output/release-tars`.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/README.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/README.md?pixel)]()
0 build-tools/build-image/Dockerfile → build/build-image/Dockerfile
View file
File renamed without changes.
0 build-tools/build-image/VERSION → build/build-image/VERSION
View file
File renamed without changes.
0 build-tools/build-image/cross/Dockerfile → build/build-image/cross/Dockerfile
View file
File renamed without changes.
0 build-tools/build-image/cross/Makefile → build/build-image/cross/Makefile
View file
File renamed without changes.
0 build-tools/build-image/cross/VERSION → build/build-image/cross/VERSION
View file
File renamed without changes.
0 ...olang-patches/CL28857-go1.7.1-luxas.patch → ...olang-patches/CL28857-go1.7.1-luxas.patch
View file
File renamed without changes.
0 build-tools/build-image/rsyncd.sh → build/build-image/rsyncd.sh
View file
File renamed without changes.
0 build-tools/cni/Makefile → build/cni/Makefile
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions build-tools/common.sh → build/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ readonly KUBE_BUILD_PPC64LE="${KUBE_BUILD_PPC64LE:-n}"

# Constants
readonly KUBE_BUILD_IMAGE_REPO=kube-build
readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat ${KUBE_ROOT}/build-tools/build-image/cross/VERSION)"
readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat ${KUBE_ROOT}/build/build-image/cross/VERSION)"

# This version number is used to cause everyone to rebuild their data containers
# and build image. This is especially useful for automated build systems like
# Jenkins.
#
# Increment/change this number if you change the build image (anything under
# build-tools/build-image) or change the set of volumes in the data container.
readonly KUBE_BUILD_IMAGE_VERSION_BASE="$(cat ${KUBE_ROOT}/build-tools/build-image/VERSION)"
# build/build-image) or change the set of volumes in the data container.
readonly KUBE_BUILD_IMAGE_VERSION_BASE="$(cat ${KUBE_ROOT}/build/build-image/VERSION)"
readonly KUBE_BUILD_IMAGE_VERSION="${KUBE_BUILD_IMAGE_VERSION_BASE}-${KUBE_BUILD_IMAGE_CROSS_TAG}"

# Here we map the output directories across both the local and remote _output
Expand Down Expand Up @@ -428,8 +428,8 @@ function kube::build::build_image() {

cp /etc/localtime "${LOCAL_OUTPUT_BUILD_CONTEXT}/"

cp build-tools/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
cp build-tools/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
cp build/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
cp build/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
dd if=/dev/urandom bs=512 count=1 2>/dev/null | LC_ALL=C tr -dc 'A-Za-z0-9' | dd bs=32 count=1 2>/dev/null > "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
chmod go= "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"

Expand Down Expand Up @@ -646,7 +646,7 @@ function kube::build::start_rsyncd_container() {
return 0
fi

kube::log::error "Could not connect to rsync container. See build-tools/README.md for setting up remote Docker engine."
kube::log::error "Could not connect to rsync container. See build/README.md for setting up remote Docker engine."
return 1
}

Expand Down
2 changes: 1 addition & 1 deletion build-tools/copy-output.sh → build/copy-output.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/build-tools/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs
kube::build::copy_output
0 build-tools/debian-iptables/Dockerfile → build/debian-iptables/Dockerfile
View file
File renamed without changes.
0 build-tools/debian-iptables/Makefile → build/debian-iptables/Makefile
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion build-tools/debian-iptables/README.md → build/debian-iptables/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ $ make push ARCH=s390x
If you don't want to push the images, run `make` or `make build` instead


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/debian-iptables/README.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/debian-iptables/README.md?pixel)]()
2 changes: 1 addition & 1 deletion build-tools/kube-dns/CHANGELOG.md → build/kube-dns/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
- First Changelog entry


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/CHANGELOG.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/CHANGELOG.md?pixel)]()
0 build-tools/kube-dns/Dockerfile → build/kube-dns/Dockerfile
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion build-tools/kube-dns/MAINTAINERS.md → build/kube-dns/MAINTAINERS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Tim Hockin <thockin@google.com>

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/MAINTAINERS.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/MAINTAINERS.md?pixel)]()
2 changes: 1 addition & 1 deletion build-tools/kube-dns/Makefile → build/kube-dns/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ all: container
container:
# Copy the content in this dir to the temp dir
cp $(KUBE_ROOT)/_output/dockerized/bin/$(PLATFORM)/$(ARCH)/kube-dns $(TEMP_DIR)
cp $(KUBE_ROOT)/build-tools/kube-dns/Dockerfile $(TEMP_DIR)
cp $(KUBE_ROOT)/build/kube-dns/Dockerfile $(TEMP_DIR)

# Replace BASEIMAGE with the real base image
cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
Expand Down
0 build-tools/kube-dns/OWNERS → build/kube-dns/OWNERS
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion build-tools/kube-dns/README.md → build/kube-dns/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ Any significant changes to the YAML template for `kube-dns` should result a bump
of the version number for the `kube-dns` replication controller and well as the
`version` label. This will permit a rolling update of `kube-dns`.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/README.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/README.md?pixel)]()
4 changes: 2 additions & 2 deletions build-tools/kube-dns/RELEASES.md → build/kube-dns/RELEASES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ are ready, not on every PR.

```
make release
cd build-tools/kube-dns
cd build/kube-dns
make container PREFIX=<your-docker-hub> TAG=rc
```

Expand Down Expand Up @@ -48,4 +48,4 @@ make container PREFIX=<your-docker-hub> TAG=rc
8. Allow the PR to be merged.


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build-tools/kube-dns/RELEASES.md?pixel)]()
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/build/kube-dns/RELEASES.md?pixel)]()
0 build-tools/lib/release.sh → build/lib/release.sh
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion build-tools/make-build-image.sh → build/make-build-image.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT="$(dirname "${BASH_SOURCE}")/.."
source "${KUBE_ROOT}/build-tools/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs
kube::build::build_image
2 changes: 1 addition & 1 deletion build-tools/make-clean.sh → build/make-clean.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/build-tools/common.sh"
source "${KUBE_ROOT}/build/common.sh"

kube::build::verify_prereqs false
kube::build::clean
0 build-tools/pause/.gitignore → build/pause/.gitignore
View file
File renamed without changes.
0 build-tools/pause/Dockerfile → build/pause/Dockerfile
View file
File renamed without changes.
0 build-tools/pause/Makefile → build/pause/Makefile
View file
File renamed without changes.
0 build-tools/pause/pause.c → build/pause/pause.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion build-tools/push-federation-images.sh → build/push-federation-images.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..

source "${KUBE_ROOT}/build-tools/util.sh"
source "${KUBE_ROOT}/build/util.sh"

source "${KUBE_ROOT}/federation/cluster/common.sh"

Expand Down
6 changes: 3 additions & 3 deletions build-tools/release.sh → build/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/build-tools/common.sh"
source "${KUBE_ROOT}/build-tools/lib/release.sh"
source "${KUBE_ROOT}/build/common.sh"
source "${KUBE_ROOT}/build/lib/release.sh"

KUBE_RELEASE_RUN_TESTS=${KUBE_RELEASE_RUN_TESTS-y}

Expand All @@ -44,7 +44,7 @@ kube::build::copy_output

if [[ "${FEDERATION:-}" == "true" ]];then
(
source "${KUBE_ROOT}/build-tools/util.sh"
source "${KUBE_ROOT}/build/util.sh"
# Write federated docker image tag to workspace
kube::release::semantic_image_tag_version > "${KUBE_ROOT}/federation/manifests/federated-image.tag"
)
Expand Down
2 changes: 1 addition & 1 deletion build-tools/run.sh → build/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "$KUBE_ROOT/build-tools/common.sh"
source "$KUBE_ROOT/build/common.sh"

kube::build::verify_prereqs
kube::build::build_image
Expand Down
4 changes: 2 additions & 2 deletions build-tools/shell.sh → build/shell.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set -o nounset
set -o pipefail

KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/build-tools/common.sh"
source "${KUBE_ROOT}/build-tools/lib/release.sh"
source "${KUBE_ROOT}/build/common.sh"
source "${KUBE_ROOT}/build/lib/release.sh"

kube::build::verify_prereqs
kube::build::build_image
Expand Down
0 build-tools/util.sh → build/util.sh
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cluster/aws/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@ function kube-push {
# KUBE_ROOT
function test-build-release {
# Make a release
"${KUBE_ROOT}/build-tools/release.sh"
"${KUBE_ROOT}/build/release.sh"
}

# Execute prior to running tests to initialize required structure. This is
Expand Down
2 changes: 1 addition & 1 deletion cluster/azure-legacy/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ function kube-down {
# KUBE_ROOT
function test-build-release {
# Make a release
"${KUBE_ROOT}/build-tools/release.sh"
"${KUBE_ROOT}/build/release.sh"
}

# SSH to a node by name ($1) and run a command ($2).
Expand Down
4 changes: 2 additions & 2 deletions cluster/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ source "${KUBE_ROOT}/cluster/lib/util.sh"
source "${KUBE_ROOT}/cluster/lib/logging.sh"
# KUBE_RELEASE_VERSION_REGEX matches things like "v1.2.3" or "v1.2.3-alpha.4"
#
# NOTE This must match the version_regex in build-tools/common.sh
# NOTE This must match the version_regex in build/common.sh
# kube::release::parse_and_validate_release_version()
KUBE_RELEASE_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(-(beta|alpha)\\.(0|[1-9][0-9]*))?$"
KUBE_RELEASE_VERSION_DASHED_REGEX="v(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(0|[1-9][0-9]*)(-(beta|alpha)-(0|[1-9][0-9]*))?"

# KUBE_CI_VERSION_REGEX matches things like "v1.2.3-alpha.4.56+abcdefg" This
#
# NOTE This must match the version_regex in build-tools/common.sh
# NOTE This must match the version_regex in build/common.sh
# kube::release::parse_and_validate_ci_version()
KUBE_CI_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)-(beta|alpha)\\.(0|[1-9][0-9]*)(\\.(0|[1-9][0-9]*)\\+[-0-9a-z]*)?$"
KUBE_CI_VERSION_DASHED_REGEX="^v(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(0|[1-9][0-9]*)-(beta|alpha)-(0|[1-9][0-9]*)(-(0|[1-9][0-9]*)\\+[-0-9a-z]*)?"
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,7 @@ function kube-push() {
# KUBE_ROOT
function test-build-release() {
# Make a release
"${KUBE_ROOT}/build-tools/release.sh"
"${KUBE_ROOT}/build/release.sh"
}

# Execute prior to running tests to initialize required structure. This is
Expand Down
2 changes: 1 addition & 1 deletion cluster/gke/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function detect-project() {
# KUBE_ROOT
function test-build-release() {
echo "... in gke:test-build-release()" >&2
"${KUBE_ROOT}/build-tools/release.sh"
"${KUBE_ROOT}/build/release.sh"
}

# Verify needed binaries exist.
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/hyperkube/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ See https://github.com/kubernetes/kubernetes/blob/master/docs/devel/local-cluste

```console
# First, build the binaries
$ build-tools/run.sh make cross
$ build/run.sh make cross

# Build for linux/amd64 (default)
$ make push VERSION={target_version} ARCH=amd64
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/kube-discovery/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Build the kube-discovery image.
#
# Requires a pre-built kube-discovery binary:
# build-tools/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/ARCH make WHAT=cmd/kube-discovery"
# build/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/ARCH make WHAT=cmd/kube-discovery"
#
# Usage:
# [ARCH=amd64] [REGISTRY="gcr.io/google_containers"] make (build|push) VERSION={some_released_version_of_kubernetes}
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/kube-discovery/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $ cat token-map.json
## Build And Run From Source

```
$ build-tools/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/amd64 make WHAT=cmd/kube-discovery"
$ build/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/amd64 make WHAT=cmd/kube-discovery"
$ _output/dockerized/bin/linux/amd64/kube-discovery
2016/08/23 19:17:28 Listening for requests on port 9898.
Expand Down
2 changes: 1 addition & 1 deletion cluster/kubectl.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if [[ -z "${KUBECTL_PATH:-}" ]]; then
echo "It looks as if you don't have a compiled kubectl binary"
echo
echo "If you are running from a clone of the git repo, please run"
echo "'./build-tools/run.sh make cross'. Note that this requires having"
echo "'./build/run.sh make cross'. Note that this requires having"
echo "Docker installed."
echo
echo "If you are running from a binary release tarball, something is wrong. "
Expand Down
2 changes: 1 addition & 1 deletion cluster/ubuntu/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NODE_IPS=""
# KUBE_ROOT
function test-build-release() {
# Make a release
"${KUBE_ROOT}/build-tools/release.sh"
"${KUBE_ROOT}/build/release.sh"
}

# From user input set the necessary k8s and etcd configuration information
Expand Down
2 changes: 1 addition & 1 deletion cluster/vagrant/util.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ function kube-push {
# Execute prior to running tests to build a release if required for env
function test-build-release {
# Make a release
"${KUBE_ROOT}/build-tools/release.sh"
"${KUBE_ROOT}/build/release.sh"
}

# Execute prior to running tests to initialize required structure
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-dns/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is a toy example demonstrating how to use kubernetes DNS.

### Step Zero: Prerequisites

This example assumes that you have forked the repository and [turned up a Kubernetes cluster](../../docs/getting-started-guides/). Make sure DNS is enabled in your setup, see [DNS doc](../../build-tools/kube-dns/).
This example assumes that you have forked the repository and [turned up a Kubernetes cluster](../../docs/getting-started-guides/). Make sure DNS is enabled in your setup, see [DNS doc](../../build/kube-dns/).

```sh
$ cd kubernetes
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql-wordpress-pd/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ this example.
* Kubernetes version 1.2 is required due to using newer features, such
at PV Claims and Deployments. Run `kubectl version` to see your
cluster version.
* [Cluster DNS](../../build-tools/kube-dns/) will be used for service discovery.
* [Cluster DNS](../../build/kube-dns/) will be used for service discovery.
* An [external load balancer](http://kubernetes.io/docs/user-guide/services/#type-loadbalancer)
will be used to access WordPress.
* [Persistent Volume Claims](http://kubernetes.io/docs/user-guide/persistent-volumes/)
Expand Down
2 changes: 1 addition & 1 deletion examples/spark/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This example assumes

- You have a Kubernetes cluster installed and running.
- That you have installed the ```kubectl``` command line tool installed in your path and configured to talk to your Kubernetes cluster
- That your Kubernetes cluster is running [kube-dns](../../build-tools/kube-dns/) or an equivalent integration.
- That your Kubernetes cluster is running [kube-dns](../../build/kube-dns/) or an equivalent integration.

Optionally, your Kubernetes cluster should be configured with a Loadbalancer integration (automatically configured via kube-up or GKE)

Expand Down
2 changes: 1 addition & 1 deletion federation/cluster/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ function push-federation-images {
: "${FEDERATION_PUSH_REPO_BASE?Must set FEDERATION_PUSH_REPO_BASE env var}"
: "${FEDERATION_IMAGE_TAG?Must set FEDERATION_IMAGE_TAG env var}"

source "${KUBE_ROOT}/build-tools/common.sh"
source "${KUBE_ROOT}/build/common.sh"
source "${KUBE_ROOT}/hack/lib/util.sh"

local FEDERATION_BINARIES=${FEDERATION_BINARIES:-"hyperkube"}
Expand Down
2 changes: 1 addition & 1 deletion federation/cluster/federation-up.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ KUBE_ROOT=$(readlink -m $(dirname "${BASH_SOURCE}")/../../)

tagfile="${KUBE_ROOT}/federation/manifests/federated-image.tag"
if [[ ! -f "$tagfile" ]]; then
echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build-tools/push-federation-images.sh"
echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build/push-federation-images.sh"
exit 1
fi
export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")"
Expand Down
Loading

0 comments on commit 27d096d

Please sign in to comment.