From ded881db20cc955fa9b91b59b4d90a85e290ba10 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Tue, 7 Mar 2017 13:59:21 -0800 Subject: [PATCH 1/2] Set wait for deletion for federation apiserver kubectl tests --- hack/make-rules/test-cmd-util.sh | 9 +++++++++ hack/make-rules/test-federation-cmd.sh | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index 882c2976a0c..04bdc6b9bba 100644 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -1812,6 +1812,9 @@ run_secrets_test() { kubectl delete secret test-secret --namespace=test-secrets ### Create a docker-registry secret in a specific namespace + if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then + kube::test::wait_object_assert 'secrets --namespace=test-secrets' "{{range.items}}{{$id_field}}:{{end}}" '' + fi # Pre-condition: no SECRET exists kube::test::get_object_assert 'secrets --namespace=test-secrets' "{{range.items}}{{$id_field}}:{{end}}" '' # Command @@ -1824,6 +1827,9 @@ run_secrets_test() { kubectl delete secret test-secret --namespace=test-secrets ### Create a tls secret + if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then + kube::test::wait_object_assert 'secrets --namespace=test-secrets' "{{range.items}}{{$id_field}}:{{end}}" '' + fi # Pre-condition: no SECRET exists kube::test::get_object_assert 'secrets --namespace=test-secrets' "{{range.items}}{{$id_field}}:{{end}}" '' # Command @@ -1858,6 +1864,9 @@ __EOF__ kubectl delete secret secret-string-data --namespace=test-secrets ### Create a secret using output flags + if [[ "${WAIT_FOR_DELETION:-}" == "true" ]]; then + kube::test::wait_object_assert 'secrets --namespace=test-secrets' "{{range.items}}{{$id_field}}:{{end}}" '' + fi # Pre-condition: no secret exists kube::test::get_object_assert 'secrets --namespace=test-secrets' "{{range.items}}{{$id_field}}:{{end}}" '' # Command diff --git a/hack/make-rules/test-federation-cmd.sh b/hack/make-rules/test-federation-cmd.sh index 1bcce54086d..84d8fae625a 100755 --- a/hack/make-rules/test-federation-cmd.sh +++ b/hack/make-rules/test-federation-cmd.sh @@ -77,6 +77,10 @@ run_federation_apiserver run_federation_controller_manager # TODO: Fix for secrets, replicasets and deployments. SUPPORTED_RESOURCES=("configmaps" "daemonsets" "events" "ingress" "namespaces" "services") +# Set wait for deletion to true for federation apiserver since resources are +# deleted asynchronously. +# This is a temporary workaround until https://github.com/kubernetes/kubernetes/issues/42594 is fixed. +WAIT_FOR_DELETION="true" # WARNING: Do not wrap this call in a subshell to capture output, e.g. output=$(runTests) # Doing so will suppress errexit behavior inside runTests runTests From 3b8ba56e7d6899fe4815b18360259bb114ad7653 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Tue, 7 Mar 2017 14:05:59 -0800 Subject: [PATCH 2/2] Enable secret tests --- hack/make-rules/test-federation-cmd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/make-rules/test-federation-cmd.sh b/hack/make-rules/test-federation-cmd.sh index 84d8fae625a..56fdfc2be62 100755 --- a/hack/make-rules/test-federation-cmd.sh +++ b/hack/make-rules/test-federation-cmd.sh @@ -75,8 +75,8 @@ kube::log::status "Running kubectl tests for federation-apiserver" setup run_federation_apiserver run_federation_controller_manager -# TODO: Fix for secrets, replicasets and deployments. -SUPPORTED_RESOURCES=("configmaps" "daemonsets" "events" "ingress" "namespaces" "services") +# TODO: Fix for replicasets and deployments. +SUPPORTED_RESOURCES=("configmaps" "daemonsets" "events" "ingress" "namespaces" "services" "secrets") # Set wait for deletion to true for federation apiserver since resources are # deleted asynchronously. # This is a temporary workaround until https://github.com/kubernetes/kubernetes/issues/42594 is fixed.