From 001899e394d9b3395312206ef33dd48bfe0b095a Mon Sep 17 00:00:00 2001
From: Janet Kuo <chiachenk@google.com>
Date: Fri, 9 Oct 2015 00:12:19 -0700
Subject: [PATCH] Enable validate when test kubectl with List

---
 hack/test-cmd.sh                                 | 6 ++----
 hack/testdata/multi-resource-rclist-modify.json  | 4 ++++
 hack/testdata/multi-resource-rclist.json         | 4 ++++
 hack/testdata/multi-resource-svclist-modify.json | 4 ++++
 hack/testdata/multi-resource-svclist.json        | 4 ++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
index b3d9f58ab78..5805c6e002a 100755
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -784,8 +784,7 @@ __EOF__
     kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
     kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
     # Command
-    # TODO: remove --validate=false when PR "Add validate support for list kind #14726" is merged
-    kubectl create -f "${file}" --validate=false "${kube_flags[@]}"
+    kubectl create -f "${file}" "${kube_flags[@]}"
     # Post-condition: mock service (and mock2) is running
     if [ "$has_svc" = true ]; then
       if [ "$two_svcs" = true ]; then
@@ -807,8 +806,7 @@ __EOF__
     kubectl get -f "${file}" "${kube_flags[@]}"
     kubectl describe -f "${file}" "${kube_flags[@]}"
     # Command
-    # TODO: remove --validate=false when PR "Add validate support for list kind #14726" is merged
-    kubectl replace -f $replace_file --force --validate=false "${kube_flags[@]}"
+    kubectl replace -f $replace_file --force "${kube_flags[@]}"
     # Post-condition: mock service (and mock2) and mock rc (and mock2) are replaced
     if [ "$has_svc" = true ]; then
       kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'replaced'
diff --git a/hack/testdata/multi-resource-rclist-modify.json b/hack/testdata/multi-resource-rclist-modify.json
index b58a7424ee6..6b050d8768b 100644
--- a/hack/testdata/multi-resource-rclist-modify.json
+++ b/hack/testdata/multi-resource-rclist-modify.json
@@ -3,6 +3,8 @@
    "apiVersion":"v1",
    "items":[
       {
+         "kind":"ReplicationController",
+         "apiVersion":"v1",
          "metadata":{
             "name":"mock",
             "labels":{
@@ -35,6 +37,8 @@
          }
       },
       {
+        "kind":"ReplicationController",
+        "apiVersion":"v1",
         "metadata":{
           "name":"mock2",
           "labels":{
diff --git a/hack/testdata/multi-resource-rclist.json b/hack/testdata/multi-resource-rclist.json
index b58a7424ee6..6b050d8768b 100644
--- a/hack/testdata/multi-resource-rclist.json
+++ b/hack/testdata/multi-resource-rclist.json
@@ -3,6 +3,8 @@
    "apiVersion":"v1",
    "items":[
       {
+         "kind":"ReplicationController",
+         "apiVersion":"v1",
          "metadata":{
             "name":"mock",
             "labels":{
@@ -35,6 +37,8 @@
          }
       },
       {
+        "kind":"ReplicationController",
+        "apiVersion":"v1",
         "metadata":{
           "name":"mock2",
           "labels":{
diff --git a/hack/testdata/multi-resource-svclist-modify.json b/hack/testdata/multi-resource-svclist-modify.json
index 32c65b143cc..6c0d6178343 100644
--- a/hack/testdata/multi-resource-svclist-modify.json
+++ b/hack/testdata/multi-resource-svclist-modify.json
@@ -3,6 +3,8 @@
   "apiVersion":"v1",
   "items":[
     {
+      "kind":"Service",
+      "apiVersion":"v1",
       "metadata":{
         "name":"mock",
         "labels":{
@@ -22,6 +24,8 @@
       }
     },
     {
+      "kind":"Service",
+      "apiVersion":"v1",
       "metadata":{
         "name":"mock2",
         "labels":{
diff --git a/hack/testdata/multi-resource-svclist.json b/hack/testdata/multi-resource-svclist.json
index d9e0abc9b0f..98fa4df2f03 100644
--- a/hack/testdata/multi-resource-svclist.json
+++ b/hack/testdata/multi-resource-svclist.json
@@ -3,6 +3,8 @@
    "apiVersion":"v1",
    "items":[
      {
+       "kind":"Service",
+       "apiVersion":"v1",
        "metadata":{
          "name":"mock",
          "labels":{
@@ -21,6 +23,8 @@
        }
      },
      {
+       "kind":"Service",
+       "apiVersion":"v1",
        "metadata":{
          "name":"mock2",
          "labels":{