|
 |
88856b2 |
From 40fda813b0c33faa060f44dd2b078b8a8674b793 Mon Sep 17 00:00:00 2001
|
|
|
88856b2 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
88856b2 |
Date: Mon, 14 Nov 2016 12:02:27 +0100
|
|
|
88856b2 |
Subject: [PATCH] make test-cmd run over hyperkube based kubectl
|
|
|
88856b2 |
|
|
|
88856b2 |
---
|
|
|
88856b2 |
src/k8s.io/kubernetes/hack/lib/test.sh | 3 ++-
|
|
|
88856b2 |
src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh | 14 +-------------
|
|
|
88856b2 |
2 files changed, 3 insertions(+), 14 deletions(-)
|
|
|
88856b2 |
|
|
|
88856b2 |
diff --git a/src/k8s.io/kubernetes/hack/lib/test.sh b/src/k8s.io/kubernetes/hack/lib/test.sh
|
|
|
88856b2 |
index 00f7ceb..26d9d85 100644
|
|
|
88856b2 |
--- a/src/k8s.io/kubernetes/hack/lib/test.sh
|
|
|
88856b2 |
+++ b/src/k8s.io/kubernetes/hack/lib/test.sh
|
|
|
88856b2 |
@@ -33,8 +33,9 @@ kube::test::get_object_assert() {
|
|
|
88856b2 |
local request=$2
|
|
|
88856b2 |
local expected=$3
|
|
|
88856b2 |
local args=${4:-}
|
|
|
88856b2 |
+ local get_args=${5:-}
|
|
|
88856b2 |
|
|
|
88856b2 |
- res=$(eval kubectl ${args} get "${kube_flags[@]}" $object -o go-template=\"$request\")
|
|
|
88856b2 |
+ res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} $object -o go-template=\"$request\")
|
|
|
88856b2 |
|
|
|
88856b2 |
if [[ "$res" =~ ^$expected$ ]]; then
|
|
|
88856b2 |
echo -n ${green}
|
|
|
88856b2 |
diff --git a/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh b/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh
|
|
|
88856b2 |
index e77b06d..b1cc52e 100755
|
|
|
88856b2 |
--- a/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh
|
|
|
88856b2 |
+++ b/src/k8s.io/kubernetes/hack/make-rules/test-cmd.sh
|
|
|
88856b2 |
@@ -147,13 +147,6 @@ function wait-for-pods-with-label()
|
|
|
88856b2 |
kube::util::trap_add cleanup EXIT SIGINT
|
|
|
88856b2 |
kube::util::ensure-temp-dir
|
|
|
88856b2 |
|
|
|
88856b2 |
-BINS=(
|
|
|
88856b2 |
- cmd/kubectl
|
|
|
88856b2 |
- cmd/kube-apiserver
|
|
|
88856b2 |
- cmd/kube-controller-manager
|
|
|
88856b2 |
-)
|
|
|
88856b2 |
-make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
|
|
|
88856b2 |
-
|
|
|
88856b2 |
kube::etcd::start
|
|
|
88856b2 |
|
|
|
88856b2 |
ETCD_HOST=${ETCD_HOST:-127.0.0.1}
|
|
|
88856b2 |
@@ -190,11 +183,6 @@ kube::log::status "Running kubectl with no options"
|
|
|
88856b2 |
# Only run kubelet on platforms it supports
|
|
|
88856b2 |
if [[ "$(go env GOHOSTOS)" == "linux" ]]; then
|
|
|
88856b2 |
|
|
|
88856b2 |
-BINS=(
|
|
|
88856b2 |
- cmd/kubelet
|
|
|
88856b2 |
-)
|
|
|
88856b2 |
-make -C "${KUBE_ROOT}" WHAT="${BINS[*]}"
|
|
|
88856b2 |
-
|
|
|
88856b2 |
kube::log::status "Starting kubelet in masterless mode"
|
|
|
88856b2 |
"${KUBE_OUTPUT_HOSTBIN}/kubelet" \
|
|
|
88856b2 |
--really-crash-for-testing=true \
|
|
|
88856b2 |
@@ -456,7 +444,7 @@ runTests() {
|
|
|
88856b2 |
# Describe command should print events information when show-events=true
|
|
|
88856b2 |
kube::test::describe_resource_events_assert pods true
|
|
|
88856b2 |
### Validate Export ###
|
|
|
88856b2 |
- kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" '<no value> valid-pod' "--export=true"
|
|
|
88856b2 |
+ kube::test::get_object_assert 'pods/valid-pod' "{{.metadata.namespace}} {{.metadata.name}}" '<no value> valid-pod' "" "--export=true"
|
|
|
88856b2 |
|
|
|
88856b2 |
### Dump current valid-pod POD
|
|
|
88856b2 |
output_pod=$(kubectl get pod valid-pod -o yaml --output-version=v1 "${kube_flags[@]}")
|
|
|
88856b2 |
--
|
|
|
88856b2 |
1.9.3
|
|
|
88856b2 |
|