From cd0772dc1f975cce583f9001b086d9b29c413685 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Mon, 24 Jul 2017 13:22:58 +0000 Subject: testing/kubernetes: upgrade to 1.7.2 --- testing/kubernetes/APKBUILD | 26 +++--- testing/kubernetes/fix-support-for-ppc64le.patch | 39 ++------- .../make-e2e_node-run-over-distro-bins.patch | 49 ++--------- ...test-cmd-run-over-hyperkube-based-kubectl.patch | 86 ++++++-------------- testing/kubernetes/no-gnu-grep.patch | 94 +++++++++++----------- ...e-apiserver-add-kube-prefix-for-hyperkube.patch | 61 ++++++-------- 6 files changed, 115 insertions(+), 240 deletions(-) diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD index 1f8a1bb6bf..8a0ae9da18 100644 --- a/testing/kubernetes/APKBUILD +++ b/testing/kubernetes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=kubernetes -pkgver=1.5.3 +pkgver=1.7.2 pkgrel=0 pkgdesc="Container Cluster Manager for Docker" url="http://kubernetes.io/" @@ -13,12 +13,10 @@ makedepends="go rsync bash linux-headers findutils coreutils" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz no-gnu-grep.patch make-e2e_node-run-over-distro-bins.patch -hyperkube-remove-federation-cmds.patch make-test-cmd-run-over-hyperkube-based-kubectl.patch build-with-debug-info.patch fix-support-for-ppc64le.patch -remove-apiserver-add-kube-prefix-for-hyperkube.patch -get-rid-of-the-git-commands-in-mungedocs.patch" +remove-apiserver-add-kube-prefix-for-hyperkube.patch" builddir="$srcdir"/$pkgname-$pkgver @@ -29,17 +27,15 @@ build() { package() { cd "$builddir" - binaries="kube-dns - kube-proxy + binaries="kube-proxy kube-apiserver kube-controller-manager kubelet kubeadm - kubemark hyperkube + kube-aggregator kube-scheduler kubectl - kube-discovery kubefed" for bin in $binaries; do install -Dm755 _output/local/bin/linux/amd64/$bin "$pkgdir"/usr/bin/$bin @@ -47,12 +43,10 @@ package() { install -d $pkgdir/var/lib/kubelet } -sha512sums="5bb6635863a98fca62bda509069d62f0f1096d1ffb3a67d280fb6ffc89dcef69a3b9ecf5b4ca835a089b2e1622df0c373b0e317d782af438f9b3794e410bf6a3 kubernetes-1.5.3.tar.gz -66f9cb208ed8074532f6013480560af44b49adca25b7e266772beaf148771af4e0d01dc42409ac81af3006036d90b822214d43fd1840d33a120dfcb0a9422a9b no-gnu-grep.patch -93bf77d0b9321f895d6d778561a7d9a0df742201b4d361a3c9d43ef2c510ca20872853cab9d2bbb577f0cb7358a58c2ef6e6b371cdba0e7d5585501246150afe make-e2e_node-run-over-distro-bins.patch -79059cdd54e5fd54b81c7d3836cc63b0546cce33929b4ce546f8b10918c362d7f4dcc9ca3fc6732d17625404dffe69b839412f20a99251021c204ac112441069 hyperkube-remove-federation-cmds.patch -6d8a9c6197025744f97db7c643e2ca651678af967c35a018185bf066d8c31ac5cfedb8fd179fd86b95e538810bf68651cfb58113fdc067d0d6837d8d0ff1110c make-test-cmd-run-over-hyperkube-based-kubectl.patch +sha512sums="38de356e95198cc7db077e994b6369e807ad65b507f14d342e82e1d08dcf03797771afe45bf043d9d40b7f49e73c3e310117eef98c32eeb4a682eb3d6b670216 kubernetes-1.7.2.tar.gz +18dadb171ba860f382d5185b88ec6a1338c322ffead133f2ab27c9bf0a2363ef4c7b94ead5a95c0d77539144e818ccc5fc864c642382d1f1974787b191a8a6ce no-gnu-grep.patch +06e3e8626b70077eb693da9c53dca3bc566aea4590a27c5dd3997b6d34abec5bf5d749b7be94b60b83361884c29b3a6dbb56c40b18c008b19e7cbd6e0d5c87e6 make-e2e_node-run-over-distro-bins.patch +07ecfbdb005250c65360a7357aeaacd1b342658c6685d37c0ea6b4740e4aebebc0213f74a81926bc0a6262161602d53f0c6cb6f19c5ecfb3be90c9372dc3cccd make-test-cmd-run-over-hyperkube-based-kubectl.patch 9f1a86529893aca8a3c757bf61e7f0bd0c6c92ccc94f48ddc583374cf92d3961f4f98a3a6c2c87c29ebeaae04a95ccdd8435d1e1eebdd82eff9c0827e810fbe6 build-with-debug-info.patch -641f8be76eb5fcfed96128e6f1ca8a35279b9cb5ce5375dfb62ce0e86e7c38cfae8e91cde0fec3fc61efd36470a046bf031c8e3ee644b8d1335336d7ebb48d75 fix-support-for-ppc64le.patch -0b6128b290a7b0f4a2466e6b46102337a15a2c6c7fee80066ccd39a43cdcd8481399f4baec4004c93e33237227b5da5517d3504d0f58ad138c0f7e97c0eabc68 remove-apiserver-add-kube-prefix-for-hyperkube.patch -1de56401931458d94143a6494cc1ec8fccd9ac551e9c065ca8ad5b0cfbba4f77d93b8e4a0c63ea71b31d94063401735e55e2b17bef7049793428a27d2b1283df get-rid-of-the-git-commands-in-mungedocs.patch" +ff043b723edc644a8270a471bfb45b400a4547a9dd70b28c5c27dc041d956da2d1da36422694b35ac589a7ca651de44c7346d3d63fd36ec570bab7325a6fd73b fix-support-for-ppc64le.patch +469a93156ea5919fa77e54a0a142bf44a899d841bdf180a78ab5fd751891b18d675bd6b807f04da85fc7962c43e2f840a4587c3145e7829878089a3b17ec187e remove-apiserver-add-kube-prefix-for-hyperkube.patch" diff --git a/testing/kubernetes/fix-support-for-ppc64le.patch b/testing/kubernetes/fix-support-for-ppc64le.patch index 820c44c030..0ee4affa7e 100644 --- a/testing/kubernetes/fix-support-for-ppc64le.patch +++ b/testing/kubernetes/fix-support-for-ppc64le.patch @@ -1,18 +1,7 @@ -From 2bdaa87387d7d02afb52ccc0fee1f0f017ce5ecc Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Thu, 5 Jan 2017 12:21:39 +0100 -Subject: [PATCH] fix support for ppc64le - ---- - src/k8s.io/kubernetes/Makefile | 2 +- - src/k8s.io/kubernetes/hack/lib/init.sh | 2 +- - src/k8s.io/kubernetes/hack/lib/util.sh | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index bce3533..e2f2bf9 100644 ---- a/Makefile -+++ b/Makefile +diff --git a/build/root/Makefile b/build/root/Makefile +index ea5eec8..5a88385 100644 +--- a/build/root/Makefile ++++ b/build/root/Makefile @@ -39,7 +39,7 @@ MAKEFLAGS += --no-builtin-rules # Constants used throughout. .EXPORT_ALL_VARIABLES: @@ -22,32 +11,16 @@ index bce3533..e2f2bf9 100644 PRJ_SRC_PATH := k8s.io/kubernetes GENERATED_FILE_PREFIX := zz_generated. -diff --git a/hack/lib/init.sh b/hack/lib/init.sh -index 0a601ac..68029e2 100644 ---- a/hack/lib/init.sh -+++ b/hack/lib/init.sh -@@ -42,7 +42,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" - source "${KUBE_ROOT}/hack/lib/golang.sh" - source "${KUBE_ROOT}/hack/lib/etcd.sh" - --KUBE_OUTPUT_HOSTBIN="/usr/bin" -+KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/go/bin" - - # list of all available group versions. This should be used when generated code - # or when starting an API server that you want to have everything. diff --git a/hack/lib/util.sh b/hack/lib/util.sh -index ada6e34..5911b65 100755 +index 50f6b55..c8a8b5e 100755 --- a/hack/lib/util.sh +++ b/hack/lib/util.sh @@ -168,7 +168,7 @@ kube::util::find-binary-for-platform() { local -r lookfor="$1" local -r platform="$2" - local -r locations=( + local locations=( - "${KUBE_ROOT}/_output/bin/${lookfor}" + "${KUBE_ROOT}/_output/local/go/bin/${lookfor}" "${KUBE_ROOT}/_output/dockerized/bin/${platform}/${lookfor}" "${KUBE_ROOT}/_output/local/bin/${platform}/${lookfor}" "${KUBE_ROOT}/platforms/${platform}/${lookfor}" --- -2.7.4 - diff --git a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch index 05d6d431b6..c2739d6747 100644 --- a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch +++ b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch @@ -1,51 +1,12 @@ -From 43f9b66744362240332241788d9811f863366f4e Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Thu, 5 Jan 2017 10:01:34 +0100 -Subject: [PATCH] make e2e_node run over distro bins - ---- - src/k8s.io/kubernetes/hack/lib/init.sh | 2 +- - src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh | 2 +- - src/k8s.io/kubernetes/test/e2e_node/builder/build.go | 6 +++++- - src/k8s.io/kubernetes/test/e2e_node/services/services.go | 5 +++++ - 4 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/hack/lib/init.sh b/hack/lib/init.sh -index ae50779..0a601ac 100644 ---- a/hack/lib/init.sh -+++ b/hack/lib/init.sh -@@ -42,7 +42,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh" - source "${KUBE_ROOT}/hack/lib/golang.sh" - source "${KUBE_ROOT}/hack/lib/etcd.sh" - --KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)" -+KUBE_OUTPUT_HOSTBIN="/usr/bin" - - # list of all available group versions. This should be used when generated code - # or when starting an API server that you want to have everything. diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh -index e98842d..3d51a06 100755 +index 54a8233..2a68768 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh -@@ -148,6 +148,6 @@ else - # Provided for backwards compatibility - go run test/e2e_node/runner/local/run_local.go --ginkgo-flags="$ginkgoflags" \ - --test-flags="--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \ +@@ -168,6 +168,6 @@ else + --container-runtime-endpoint=${container_runtime_endpoint} \ + --image-service-endpoint=${image_service_endpoint} \ + --alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \ - $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt" + $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt" exit $? fi -diff --git a/test/e2e_node/builder/build.go b/test/e2e_node/builder/build.go -index f22232a..c49c35f 100644 ---- a/test/e2e_node/builder/build.go -+++ b/test/e2e_node/builder/build.go -@@ -31,7 +31,7 @@ import ( - var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet binaries.") - - var buildTargets = []string{ -- "cmd/kubelet", -+ //"cmd/kubelet", - "test/e2e_node/e2e_node.test", - "vendor/github.com/onsi/ginkgo/ginkgo", - } - diff --git a/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch b/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch index 30d4fdbf2e..efc153817f 100644 --- a/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch +++ b/testing/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch @@ -1,67 +1,29 @@ -From 40fda813b0c33faa060f44dd2b078b8a8674b793 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Mon, 14 Nov 2016 12:02:27 +0100 -Subject: [PATCH] make test-cmd run over hyperkube based kubectl - ---- - src/k8s.io/kubernetes/hack/lib/test.sh | 3 ++- - src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh | 14 +------------- - 2 files changed, 3 insertions(+), 14 deletions(-) - diff --git a/hack/lib/test.sh b/hack/lib/test.sh -index 00f7ceb..26d9d85 100644 +index 575664a..7318cf9 100644 --- a/hack/lib/test.sh +++ b/hack/lib/test.sh -@@ -33,8 +33,9 @@ kube::test::get_object_assert() { - local request=$2 - local expected=$3 - local args=${4:-} +@@ -73,10 +73,10 @@ kube::test::object_assert() { + local object=$2 + local request=$3 + local expected=$4 +- local args=${5:-} + local get_args=${5:-} -- res=$(eval kubectl ${args} get "${kube_flags[@]}" $object -o go-template=\"$request\") -+ res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} $object -o go-template=\"$request\") - - if [[ "$res" =~ ^$expected$ ]]; then - echo -n ${green} -diff --git a/hack/make-rules/test-cmd.sh b/hack/make-rules/test-cmd.sh -index e77b06d..b1cc52e 100755 ---- a/hack/make-rules/test-cmd.sh -+++ b/hack/make-rules/test-cmd.sh -@@ -147,13 +147,6 @@ function wait-for-pods-with-label() - kube::util::trap_add cleanup EXIT SIGINT - kube::util::ensure-temp-dir - --BINS=( -- cmd/kubectl -- cmd/kube-apiserver -- cmd/kube-controller-manager --) --make -C "${KUBE_ROOT}" WHAT="${BINS[*]}" -- - kube::etcd::start - - ETCD_HOST=${ETCD_HOST:-127.0.0.1} -@@ -190,11 +183,6 @@ kube::log::status "Running kubectl with no options" - # Only run kubelet on platforms it supports - if [[ "$(go env GOHOSTOS)" == "linux" ]]; then - --BINS=( -- cmd/kubelet --) --make -C "${KUBE_ROOT}" WHAT="${BINS[*]}" -- - kube::log::status "Starting kubelet in masterless mode" - "${KUBE_OUTPUT_HOSTBIN}/kubelet" \ - --really-crash-for-testing=true \ -@@ -456,7 +444,7 @@ runTests() { - # Describe command should print events information when show-events=true - kube::test::describe_resource_events_assert pods true - ### Validate Export ### -- kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" ' valid-pod' "--export=true" -+ kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" ' valid-pod' "" "--export=true" - - ### Dump current valid-pod POD - output_pod=$(kubectl get pod valid-pod -o yaml --output-version=v1 "${kube_flags[@]}") --- -1.9.3 - + for j in $(seq 1 ${tries}); do +- res=$(eval kubectl get -a "${kube_flags[@]}" ${args} $object -o go-template=\"$request\") ++ res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} $object -o go-template=\"$request\") + if [[ "$res" =~ ^$expected$ ]]; then + echo -n ${green} + echo "$(kube::test::get_caller 3): Successful get $object $request: $res" +diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh +index 2a68768..54a8233 100755 +--- a/hack/make-rules/test-e2e-node.sh ++++ b/hack/make-rules/test-e2e-node.sh +@@ -168,6 +168,6 @@ else + --container-runtime-endpoint=${container_runtime_endpoint} \ + --image-service-endpoint=${image_service_endpoint} \ + --alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \ +- $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt" ++ $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt" + exit $? + fi diff --git a/testing/kubernetes/no-gnu-grep.patch b/testing/kubernetes/no-gnu-grep.patch index 4c7d1991ba..191b3ed404 100644 --- a/testing/kubernetes/no-gnu-grep.patch +++ b/testing/kubernetes/no-gnu-grep.patch @@ -1,8 +1,8 @@ -diff --git a/Makefile.generated_files b/Makefile.generated_files -index 13a4bbb..a4ea832 100644 ---- a/Makefile.generated_files -+++ b/Makefile.generated_files -@@ -156,7 +156,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval \ +diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files +index 45287dc..8617f49 100644 +--- a/build/root/Makefile.generated_files ++++ b/build/root/Makefile.generated_files +@@ -155,7 +155,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval \ # is what the .stamp file represents. $(foreach dir, $(ALL_GO_DIRS), \ $(META_DIR)/$(dir)/$(GOFILES_META)): @@ -11,7 +11,7 @@ index 13a4bbb..a4ea832 100644 mkdir -p $(@D); \ echo "gofiles__$< := $$(echo $${FILES})" >$@.tmp; \ cmp -s $@.tmp $@ || touch $@.stamp; \ -@@ -182,7 +182,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -181,7 +181,7 @@ ifeq ($(DBG_MAKEFILE),1) endif ALL_K8S_TAG_FILES := $(shell \ find $(ALL_GO_DIRS) -maxdepth 1 -type f -name \*.go \ @@ -20,7 +20,7 @@ index 13a4bbb..a4ea832 100644 ) # -@@ -209,7 +209,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -208,7 +208,7 @@ ifeq ($(DBG_MAKEFILE),1) $(warning ***** finding all +k8s:deepcopy-gen tags) endif DEEPCOPY_DIRS := $(shell \ @@ -29,16 +29,16 @@ index 13a4bbb..a4ea832 100644 | xargs -n1 dirname \ | LC_ALL=C sort -u \ ) -@@ -278,7 +278,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk: - INDIRECT=$$(go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/deepcopy-gen \ -- | grep --color=never "^$(PRJ_SRC_PATH)" \ -+ | grep "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ -@@ -334,7 +334,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -275,7 +275,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk: + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/deepcopy-gen \ +- | grep --color=never "^$(PRJ_SRC_PATH)/" \ ++ | grep "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ +@@ -332,7 +332,7 @@ ifeq ($(DBG_MAKEFILE),1) $(warning ***** finding all +k8s:defaulter-gen tags) endif DEFAULTER_DIRS := $(shell \ @@ -47,16 +47,16 @@ index 13a4bbb..a4ea832 100644 | xargs -n1 dirname \ | LC_ALL=C sort -u \ ) -@@ -429,7 +429,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk: - INDIRECT=$$(go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/defaulter-gen \ -- | grep --color=never "^$(PRJ_SRC_PATH)" \ -+ | grep "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ -@@ -475,7 +475,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -425,7 +425,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk: + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/defaulter-gen \ +- | grep --color=never "^$(PRJ_SRC_PATH)/" \ ++ | grep "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ +@@ -472,7 +472,7 @@ ifeq ($(DBG_MAKEFILE),1) $(warning ***** finding all +k8s:openapi-gen tags) endif OPENAPI_DIRS := $(shell \ @@ -65,16 +65,16 @@ index 13a4bbb..a4ea832 100644 | xargs -n1 dirname \ | LC_ALL=C sort -u \ ) -@@ -536,7 +536,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk: - INDIRECT=$$(go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/openapi-gen \ -- | grep --color=never "^$(PRJ_SRC_PATH)" \ -+ | grep "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ -@@ -593,7 +593,7 @@ ifeq ($(DBG_MAKEFILE),1) +@@ -523,7 +523,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk: + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/openapi-gen \ +- | grep --color=never "^$(PRJ_SRC_PATH)/" \ ++ | grep "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ +@@ -581,7 +581,7 @@ ifeq ($(DBG_MAKEFILE),1) $(warning ***** finding all +k8s:conversion-gen tags) endif CONVERSION_DIRS := $(shell \ @@ -83,7 +83,7 @@ index 13a4bbb..a4ea832 100644 | cut -f1 -d: \ | xargs -n1 dirname \ | LC_ALL=C sort -u \ -@@ -651,7 +651,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval \ +@@ -639,7 +639,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval \ # is what the .stamp file represents. $(foreach dir, $(CONVERSION_DIRS), \ $(META_DIR)/$(dir)/$(CONVERSIONS_META)): @@ -92,12 +92,12 @@ index 13a4bbb..a4ea832 100644 | cut -f2- -d= \ | sed 's|$(PRJ_SRC_PATH)/||'); \ mkdir -p $(@D); \ -@@ -731,7 +731,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk: - INDIRECT=$$(go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/conversion-gen \ -- | grep --color=never "^$(PRJ_SRC_PATH)" \ -+ | grep "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ +@@ -717,7 +717,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk: + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/conversion-gen \ +- | grep --color=never "^$(PRJ_SRC_PATH)/" \ ++ | grep "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ diff --git a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch index c498f0d8c0..ad691e1c45 100644 --- a/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch +++ b/testing/kubernetes/remove-apiserver-add-kube-prefix-for-hyperkube.patch @@ -1,59 +1,47 @@ -From f8748053d34c651230fbc317e25d74d404548c66 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Fri, 26 Feb 2016 16:17:24 +0100 -Subject: [PATCH] remove apiserver, add kube-prefix for hyperkube - ---- - cmd/hyperkube/kube-controller-manager.go | 2 +- - cmd/hyperkube/kube-proxy.go | 2 +- - cmd/hyperkube/kube-scheduler.go | 2 +- - cmd/hyperkube/main.go | 1 - - 4 files changed, 3 insertions(+), 4 deletions(-) - diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go -index 57d4856..1fc5107 100644 +index 35061e9..482958d 100644 --- a/cmd/hyperkube/kube-controller-manager.go +++ b/cmd/hyperkube/kube-controller-manager.go @@ -29,7 +29,7 @@ func NewKubeControllerManager() *Server { - s := options.NewCMServer() - hks := Server{ -- SimpleUsage: "controller-manager", -+ SimpleUsage: "kube-controller-manager", - Long: "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.", + name: "controller-manager", + AlternativeName: "kube-controller-manager", +- SimpleUsage: "controller-manager", ++ SimpleUsage: "kube-controller-manager", + Long: "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.", Run: func(_ *Server, args []string) error { return app.Run(s) diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go -index 2f8678d..0a010d8 100644 +index 76bc2dc..1eba8a7 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go -@@ -29,7 +29,7 @@ func NewKubeProxy() *Server { - config := options.NewProxyConfig() - +@@ -33,7 +33,7 @@ func NewKubeProxy() *Server { hks := Server{ -- SimpleUsage: "proxy", -+ SimpleUsage: "kube-proxy", - Long: `The Kubernetes proxy server is responsible for taking traffic directed at - services and forwarding it to the appropriate pods. It generally runs on - nodes next to the Kubelet and proxies traffic from local pods to remote pods. + name: "proxy", + AlternativeName: "kube-proxy", +- SimpleUsage: "proxy", ++ SimpleUsage: "kube-proxy", + Long: command.Long, + } + diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go -index 799038d..4be08e1 100644 +index fd00103..587a9a1 100644 --- a/cmd/hyperkube/kube-scheduler.go +++ b/cmd/hyperkube/kube-scheduler.go @@ -29,7 +29,7 @@ func NewScheduler() *Server { - s := options.NewSchedulerServer() - hks := Server{ -- SimpleUsage: "scheduler", -+ SimpleUsage: "kube-scheduler", - Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.", + name: "scheduler", + AlternativeName: "kube-scheduler", +- SimpleUsage: "scheduler", ++ SimpleUsage: "kube-scheduler", + Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.", Run: func(_ *Server, _ []string) error { return app.Run(s) diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go -index 4d9c499..8b060ba 100644 +index e1e07b7..10ed8b1 100644 --- a/cmd/hyperkube/main.go +++ b/cmd/hyperkube/main.go -@@ -32,7 +32,6 @@ func main() { +@@ -33,7 +33,6 @@ func main() { } hk.AddServer(NewKubectlServer()) @@ -61,6 +49,3 @@ index 4d9c499..8b060ba 100644 hk.AddServer(NewKubeControllerManager()) hk.AddServer(NewScheduler()) hk.AddServer(NewKubelet()) --- -1.9.3 - -- cgit v1.2.3