From e851af0aab8e76b058bf47a3be659da723c2d8c8 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 27 Jun 2019 10:46:24 -0700 Subject: [PATCH] Removes test-cmd inappropriate dependency on kubectl --- test/cmd/BUILD | 1 - test/cmd/core.sh | 2 +- .../fixtures/pkg/kubectl/cmd/patch/validPod.yaml | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 test/fixtures/pkg/kubectl/cmd/patch/validPod.yaml diff --git a/test/cmd/BUILD b/test/cmd/BUILD index 136d0c6b998..8f9023e3a2c 100644 --- a/test/cmd/BUILD +++ b/test/cmd/BUILD @@ -1,7 +1,6 @@ sh_library( name = "legacy-script", srcs = glob(["*.sh"]), - data = ["//pkg/kubectl/validation:testdata/v1/validPod.yaml"], visibility = ["//visibility:public"], ) diff --git a/test/cmd/core.sh b/test/cmd/core.sh index 291170bf70a..40ab6643243 100755 --- a/test/cmd/core.sh +++ b/test/cmd/core.sh @@ -438,7 +438,7 @@ run_pod_tests() { kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'valid-pod:' ## Patch can modify a local object - kubectl patch --local -f pkg/kubectl/validation/testdata/v1/validPod.yaml --patch='{"spec": {"restartPolicy":"Never"}}' -o yaml | grep -q "Never" + kubectl patch --local -f test/fixtures/pkg/kubectl/cmd/patch/validPod.yaml --patch='{"spec": {"restartPolicy":"Never"}}' -o yaml | grep -q "Never" ## Patch fails with type restore error and exit code 1 output_message=$(! kubectl patch "${kube_flags[@]}" pod valid-pod -p='{"metadata":{"labels":"invalid"}}' 2>&1) diff --git a/test/fixtures/pkg/kubectl/cmd/patch/validPod.yaml b/test/fixtures/pkg/kubectl/cmd/patch/validPod.yaml new file mode 100644 index 00000000000..3849ba7a1f0 --- /dev/null +++ b/test/fixtures/pkg/kubectl/cmd/patch/validPod.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Pod +metadata: + labels: + name: redis-master + name: name +spec: + containers: + - args: + - this + - is + - an + - ok + - command + image: gcr.io/fake_project/fake_image:fake_tag + name: master