Commit 001899e3 authored by Janet Kuo's avatar Janet Kuo

Enable validate when test kubectl with List

parent 8e25b7c7
...@@ -784,8 +784,7 @@ __EOF__ ...@@ -784,8 +784,7 @@ __EOF__
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:' kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
# Command # Command
# TODO: remove --validate=false when PR "Add validate support for list kind #14726" is merged kubectl create -f "${file}" "${kube_flags[@]}"
kubectl create -f "${file}" --validate=false "${kube_flags[@]}"
# Post-condition: mock service (and mock2) is running # Post-condition: mock service (and mock2) is running
if [ "$has_svc" = true ]; then if [ "$has_svc" = true ]; then
if [ "$two_svcs" = true ]; then if [ "$two_svcs" = true ]; then
...@@ -807,8 +806,7 @@ __EOF__ ...@@ -807,8 +806,7 @@ __EOF__
kubectl get -f "${file}" "${kube_flags[@]}" kubectl get -f "${file}" "${kube_flags[@]}"
kubectl describe -f "${file}" "${kube_flags[@]}" kubectl describe -f "${file}" "${kube_flags[@]}"
# Command # Command
# TODO: remove --validate=false when PR "Add validate support for list kind #14726" is merged kubectl replace -f $replace_file --force "${kube_flags[@]}"
kubectl replace -f $replace_file --force --validate=false "${kube_flags[@]}"
# Post-condition: mock service (and mock2) and mock rc (and mock2) are replaced # Post-condition: mock service (and mock2) and mock rc (and mock2) are replaced
if [ "$has_svc" = true ]; then if [ "$has_svc" = true ]; then
kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'replaced' kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'replaced'
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"apiVersion":"v1", "apiVersion":"v1",
"items":[ "items":[
{ {
"kind":"ReplicationController",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock", "name":"mock",
"labels":{ "labels":{
...@@ -35,6 +37,8 @@ ...@@ -35,6 +37,8 @@
} }
}, },
{ {
"kind":"ReplicationController",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock2", "name":"mock2",
"labels":{ "labels":{
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"apiVersion":"v1", "apiVersion":"v1",
"items":[ "items":[
{ {
"kind":"ReplicationController",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock", "name":"mock",
"labels":{ "labels":{
...@@ -35,6 +37,8 @@ ...@@ -35,6 +37,8 @@
} }
}, },
{ {
"kind":"ReplicationController",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock2", "name":"mock2",
"labels":{ "labels":{
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"apiVersion":"v1", "apiVersion":"v1",
"items":[ "items":[
{ {
"kind":"Service",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock", "name":"mock",
"labels":{ "labels":{
...@@ -22,6 +24,8 @@ ...@@ -22,6 +24,8 @@
} }
}, },
{ {
"kind":"Service",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock2", "name":"mock2",
"labels":{ "labels":{
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"apiVersion":"v1", "apiVersion":"v1",
"items":[ "items":[
{ {
"kind":"Service",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock", "name":"mock",
"labels":{ "labels":{
...@@ -21,6 +23,8 @@ ...@@ -21,6 +23,8 @@
} }
}, },
{ {
"kind":"Service",
"apiVersion":"v1",
"metadata":{ "metadata":{
"name":"mock2", "name":"mock2",
"labels":{ "labels":{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment