Skip to content

Commit 27d096d

Browse files
ixdyixdy
committed
Rename build-tools/ back to build/
1 parent 4bcb27e commit 27d096d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+71
-71
lines changed

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ clean:
273273
@echo "$$CLEAN_HELP_INFO"
274274
else
275275
clean: clean_meta
276-
build-tools/make-clean.sh
276+
build/make-clean.sh
277277
rm -rf $(OUT_DIR)
278278
rm -rf Godeps/_workspace # Just until we are sure it is gone
279279
endif
@@ -342,7 +342,7 @@ release:
342342
@echo "$$RELEASE_HELP_INFO"
343343
else
344344
release:
345-
build-tools/release.sh
345+
build/release.sh
346346
endif
347347

348348
define RELEASE_SKIP_TESTS_HELP_INFO
@@ -357,7 +357,7 @@ release-skip-tests quick-release:
357357
@echo "$$RELEASE_SKIP_TESTS_HELP_INFO"
358358
else
359359
release-skip-tests quick-release:
360-
KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build-tools/release.sh
360+
KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build/release.sh
361361
endif
362362

363363
define CROSS_HELP_INFO

‎build-tools/BUILD ‎build/BUILD

File renamed without changes.

‎build-tools/OWNERS ‎build/OWNERS

File renamed without changes.

‎build-tools/README.md ‎build/README.md

+14-14

‎build-tools/build-image/Dockerfile ‎build/build-image/Dockerfile

File renamed without changes.

‎build-tools/build-image/VERSION ‎build/build-image/VERSION

File renamed without changes.

‎build-tools/build-image/cross/Dockerfile ‎build/build-image/cross/Dockerfile

File renamed without changes.

‎build-tools/build-image/cross/Makefile ‎build/build-image/cross/Makefile

File renamed without changes.

‎build-tools/build-image/cross/VERSION ‎build/build-image/cross/VERSION

File renamed without changes.

‎build-tools/build-image/cross/golang-patches/CL28857-go1.7.1-luxas.patch ‎build/build-image/cross/golang-patches/CL28857-go1.7.1-luxas.patch

File renamed without changes.

‎build-tools/build-image/rsyncd.sh ‎build/build-image/rsyncd.sh

File renamed without changes.

‎build-tools/cni/Makefile ‎build/cni/Makefile

File renamed without changes.

‎build-tools/common.sh ‎build/common.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ readonly KUBE_BUILD_PPC64LE="${KUBE_BUILD_PPC64LE:-n}"
4141

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

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

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

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

431-
cp build-tools/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
432-
cp build-tools/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
431+
cp build/build-image/Dockerfile "${LOCAL_OUTPUT_BUILD_CONTEXT}/Dockerfile"
432+
cp build/build-image/rsyncd.sh "${LOCAL_OUTPUT_BUILD_CONTEXT}/"
433433
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"
434434
chmod go= "${LOCAL_OUTPUT_BUILD_CONTEXT}/rsyncd.password"
435435

@@ -646,7 +646,7 @@ function kube::build::start_rsyncd_container() {
646646
return 0
647647
fi
648648

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

‎build-tools/copy-output.sh ‎build/copy-output.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -o nounset
2020
set -o pipefail
2121

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

2525
kube::build::verify_prereqs
2626
kube::build::copy_output

‎build-tools/debian-iptables/Dockerfile ‎build/debian-iptables/Dockerfile

File renamed without changes.

‎build-tools/debian-iptables/Makefile ‎build/debian-iptables/Makefile

File renamed without changes.

‎build-tools/debian-iptables/README.md ‎build/debian-iptables/README.md

+1-1

‎build-tools/kube-dns/CHANGELOG.md ‎build/kube-dns/CHANGELOG.md

+1-1

‎build-tools/kube-dns/Dockerfile ‎build/kube-dns/Dockerfile

File renamed without changes.

‎build-tools/kube-dns/MAINTAINERS.md ‎build/kube-dns/MAINTAINERS.md

+1-1

‎build-tools/kube-dns/Makefile ‎build/kube-dns/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ all: container
5151
container:
5252
# Copy the content in this dir to the temp dir
5353
cp $(KUBE_ROOT)/_output/dockerized/bin/$(PLATFORM)/$(ARCH)/kube-dns $(TEMP_DIR)
54-
cp $(KUBE_ROOT)/build-tools/kube-dns/Dockerfile $(TEMP_DIR)
54+
cp $(KUBE_ROOT)/build/kube-dns/Dockerfile $(TEMP_DIR)
5555

5656
# Replace BASEIMAGE with the real base image
5757
cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile

‎build-tools/kube-dns/OWNERS ‎build/kube-dns/OWNERS

File renamed without changes.

‎build-tools/kube-dns/README.md ‎build/kube-dns/README.md

+1-1

‎build-tools/kube-dns/RELEASES.md ‎build/kube-dns/RELEASES.md

+2-2

‎build-tools/lib/release.sh ‎build/lib/release.sh

File renamed without changes.

‎build-tools/make-build-image.sh ‎build/make-build-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set -o nounset
2525
set -o pipefail
2626

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

3030
kube::build::verify_prereqs
3131
kube::build::build_image

‎build-tools/make-clean.sh ‎build/make-clean.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -o nounset
2020
set -o pipefail
2121

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

2525
kube::build::verify_prereqs false
2626
kube::build::clean

‎build-tools/pause/.gitignore ‎build/pause/.gitignore

File renamed without changes.

‎build-tools/pause/Dockerfile ‎build/pause/Dockerfile

File renamed without changes.

‎build-tools/pause/Makefile ‎build/pause/Makefile

File renamed without changes.

‎build-tools/pause/pause.c ‎build/pause/pause.c

File renamed without changes.

‎build-tools/push-federation-images.sh ‎build/push-federation-images.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -o pipefail
2222

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

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

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

‎build-tools/release.sh ‎build/release.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ set -o nounset
2626
set -o pipefail
2727

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

3232
KUBE_RELEASE_RUN_TESTS=${KUBE_RELEASE_RUN_TESTS-y}
3333

@@ -44,7 +44,7 @@ kube::build::copy_output
4444

4545
if [[ "${FEDERATION:-}" == "true" ]];then
4646
(
47-
source "${KUBE_ROOT}/build-tools/util.sh"
47+
source "${KUBE_ROOT}/build/util.sh"
4848
# Write federated docker image tag to workspace
4949
kube::release::semantic_image_tag_version > "${KUBE_ROOT}/federation/manifests/federated-image.tag"
5050
)

‎build-tools/run.sh ‎build/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set -o nounset
2323
set -o pipefail
2424

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

2828
kube::build::verify_prereqs
2929
kube::build::build_image

‎build-tools/shell.sh ‎build/shell.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ set -o nounset
2323
set -o pipefail
2424

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

2929
kube::build::verify_prereqs
3030
kube::build::build_image

‎build-tools/util.sh ‎build/util.sh

File renamed without changes.

‎cluster/aws/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,7 @@ function kube-push {
15491549
# KUBE_ROOT
15501550
function test-build-release {
15511551
# Make a release
1552-
"${KUBE_ROOT}/build-tools/release.sh"
1552+
"${KUBE_ROOT}/build/release.sh"
15531553
}
15541554

15551555
# Execute prior to running tests to initialize required structure. This is

‎cluster/azure-legacy/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ function kube-down {
522522
# KUBE_ROOT
523523
function test-build-release {
524524
# Make a release
525-
"${KUBE_ROOT}/build-tools/release.sh"
525+
"${KUBE_ROOT}/build/release.sh"
526526
}
527527

528528
# SSH to a node by name ($1) and run a command ($2).

‎cluster/common.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ source "${KUBE_ROOT}/cluster/lib/util.sh"
2828
source "${KUBE_ROOT}/cluster/lib/logging.sh"
2929
# KUBE_RELEASE_VERSION_REGEX matches things like "v1.2.3" or "v1.2.3-alpha.4"
3030
#
31-
# NOTE This must match the version_regex in build-tools/common.sh
31+
# NOTE This must match the version_regex in build/common.sh
3232
# kube::release::parse_and_validate_release_version()
3333
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]*))?$"
3434
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]*))?"
3535

3636
# KUBE_CI_VERSION_REGEX matches things like "v1.2.3-alpha.4.56+abcdefg" This
3737
#
38-
# NOTE This must match the version_regex in build-tools/common.sh
38+
# NOTE This must match the version_regex in build/common.sh
3939
# kube::release::parse_and_validate_ci_version()
4040
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]*)?$"
4141
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]*)?"

‎cluster/gce/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ function kube-push() {
17921792
# KUBE_ROOT
17931793
function test-build-release() {
17941794
# Make a release
1795-
"${KUBE_ROOT}/build-tools/release.sh"
1795+
"${KUBE_ROOT}/build/release.sh"
17961796
}
17971797

17981798
# Execute prior to running tests to initialize required structure. This is

‎cluster/gke/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function detect-project() {
8585
# KUBE_ROOT
8686
function test-build-release() {
8787
echo "... in gke:test-build-release()" >&2
88-
"${KUBE_ROOT}/build-tools/release.sh"
88+
"${KUBE_ROOT}/build/release.sh"
8989
}
9090

9191
# Verify needed binaries exist.

‎cluster/images/hyperkube/README.md

+1-1

‎cluster/images/kube-discovery/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Build the kube-discovery image.
1616
#
1717
# Requires a pre-built kube-discovery binary:
18-
# build-tools/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/ARCH make WHAT=cmd/kube-discovery"
18+
# build/run.sh /bin/bash -c "KUBE_BUILD_PLATFORMS=linux/ARCH make WHAT=cmd/kube-discovery"
1919
#
2020
# Usage:
2121
# [ARCH=amd64] [REGISTRY="gcr.io/google_containers"] make (build|push) VERSION={some_released_version_of_kubernetes}

‎cluster/images/kube-discovery/README.md

+1-1

‎cluster/kubectl.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ if [[ -z "${KUBECTL_PATH:-}" ]]; then
9797
echo "It looks as if you don't have a compiled kubectl binary"
9898
echo
9999
echo "If you are running from a clone of the git repo, please run"
100-
echo "'./build-tools/run.sh make cross'. Note that this requires having"
100+
echo "'./build/run.sh make cross'. Note that this requires having"
101101
echo "Docker installed."
102102
echo
103103
echo "If you are running from a binary release tarball, something is wrong. "

‎cluster/ubuntu/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ NODE_IPS=""
2828
# KUBE_ROOT
2929
function test-build-release() {
3030
# Make a release
31-
"${KUBE_ROOT}/build-tools/release.sh"
31+
"${KUBE_ROOT}/build/release.sh"
3232
}
3333

3434
# From user input set the necessary k8s and etcd configuration information

‎cluster/vagrant/util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ function kube-push {
330330
# Execute prior to running tests to build a release if required for env
331331
function test-build-release {
332332
# Make a release
333-
"${KUBE_ROOT}/build-tools/release.sh"
333+
"${KUBE_ROOT}/build/release.sh"
334334
}
335335

336336
# Execute prior to running tests to initialize required structure

‎examples/cluster-dns/README.md

+1-1

‎examples/mysql-wordpress-pd/README.md

+1-1

‎examples/spark/README.md

+1-1

‎federation/cluster/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ function push-federation-images {
293293
: "${FEDERATION_PUSH_REPO_BASE?Must set FEDERATION_PUSH_REPO_BASE env var}"
294294
: "${FEDERATION_IMAGE_TAG?Must set FEDERATION_IMAGE_TAG env var}"
295295

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

299299
local FEDERATION_BINARIES=${FEDERATION_BINARIES:-"hyperkube"}

‎federation/cluster/federation-up.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ KUBE_ROOT=$(readlink -m $(dirname "${BASH_SOURCE}")/../../)
2424

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

0 commit comments

Comments
 (0)