Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #15010 #15042 #15980 #16327

Merged
merged 3 commits into from
Oct 27, 2015
Merged

Automated cherry pick of #15010 #15042 #15980 #16327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4228ef2
Loop three types of files for each "multiple resources" test
janetkuo Oct 2, 2015
fba86f3
Add test for kubectl support of ReplicationControllerList and Service…
janetkuo Oct 3, 2015
bbe6fdf
Fixed the error for kubectl edit multiple resources
janetkuo Oct 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
226 changes: 130 additions & 96 deletions hack/test-cmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,102 +757,136 @@ __EOF__
kube::log::status "Testing kubectl(${version}:multiple resources)"
# TODO: add test for types like ReplicationControllerList, ServiceList

### Create, get, describe, replace, label, annotate, and then delete service nginxsvc and replication controller my-nginx from YAML, separated by ---
# Pre-condition: no service (other than default kubernetes services) or replication controller is running
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
# Command
kubectl create -f examples/https-nginx/nginx-app.yaml "${kube_flags[@]}"
# Post-condition: nginxsvc service is running
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:nginxsvc:'
# Post-condition: my-nginx rc is running
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'my-nginx:'
# Command
kubectl get -f examples/https-nginx/nginx-app.yaml "${kube_flags[@]}"
kubectl describe -f examples/https-nginx/nginx-app.yaml "${kube_flags[@]}"
# Command
kubectl replace -f hack/testdata/nginx-app-modify.yaml --force "${kube_flags[@]}"
# Post-condition: nginxsvc service and mock rc are replaced
kube::test::get_object_assert 'services nginxsvc' "{{${labels_field}.status}}" 'replaced'
kube::test::get_object_assert 'rc my-nginx' "{{${labels_field}.status}}" 'replaced'
# Command
kubectl label -f examples/https-nginx/nginx-app.yaml labeled=true "${kube_flags[@]}"
# Post-condition: nginxsvc service and my-nginx rc are labeled
kube::test::get_object_assert 'services nginxsvc' "{{${labels_field}.labeled}}" 'true'
kube::test::get_object_assert 'rc my-nginx' "{{${labels_field}.labeled}}" 'true'
# Command
kubectl annotate -f examples/https-nginx/nginx-app.yaml annotated=true "${kube_flags[@]}"
# Post-condition: nginxsvc service and my-nginx rc are annotated
kube::test::get_object_assert 'services nginxsvc' "{{${annotations_field}.annotated}}" 'true'
kube::test::get_object_assert 'rc my-nginx' "{{${annotations_field}.annotated}}" 'true'
# Cleanup service and rc
kubectl delete -f examples/https-nginx/nginx-app.yaml "${kube_flags[@]}"

### Create, get, describe, replace, label, annotate, and then delete service nginxsvc and replication controller my-nginx from JSON, with a List type
# Pre-condition: no service (other than default kubernetes services) or replication controller is running
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 hack/testdata/multi-resource-list.json --validate=false "${kube_flags[@]}"
# Post-condition: mock service is running
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:mock:'
# Post-condition: mock rc is running
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'mock:'
# Command
# kubectl create -f hack/testdata/multi-resource.json "${kube_flags[@]}" # test fails here now
# TODO: test get when PR "Fix get with List #14888" is merged
# kubectl get -f hack/testdata/multi-resource-list.json "${kube_flags[@]}"
kubectl describe -f hack/testdata/multi-resource-list.json "${kube_flags[@]}"
# Command
# TODO: remove --validate=false when PR "Add validate support for list kind #14726" is merged
kubectl replace -f hack/testdata/multi-resource-list-modify.json --force --validate=false "${kube_flags[@]}"
# Post-condition: mock service and mock rc are replaced
kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'replaced'
kube::test::get_object_assert 'rc mock' "{{${labels_field}.status}}" 'replaced'
# Command
kubectl label -f hack/testdata/multi-resource-list.json labeled=true "${kube_flags[@]}"
# Post-condition: mock service and mock rc are labeled
kube::test::get_object_assert 'services mock' "{{${labels_field}.labeled}}" 'true'
kube::test::get_object_assert 'rc mock' "{{${labels_field}.labeled}}" 'true'
# Command
kubectl annotate -f hack/testdata/multi-resource-list.json annotated=true "${kube_flags[@]}"
# Post-condition: mock service and mock rc are annotated
kube::test::get_object_assert 'services mock' "{{${annotations_field}.annotated}}" 'true'
kube::test::get_object_assert 'rc mock' "{{${annotations_field}.annotated}}" 'true'
# Cleanup services and rc
kubectl delete -f hack/testdata/multi-resource-list.json "${kube_flags[@]}"

### Create, get, describe, replace, label, annotate, and then delete service nginxsvc and replication controller my-nginx from JSON, with JSON object concatenation
# Pre-condition: no service (other than default kubernetes services) or replication controller is running
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:'
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
# Command
kubectl create -f hack/testdata/multi-resource.json "${kube_flags[@]}"
# Post-condition: mock service is running
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:mock:'
# Post-condition: mock rc is running
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'mock:'
# Command
kubectl get -f hack/testdata/multi-resource.json "${kube_flags[@]}"
kubectl describe -f hack/testdata/multi-resource.json "${kube_flags[@]}"
# Command
kubectl replace -f hack/testdata/multi-resource-modify.json --force "${kube_flags[@]}"
# Post-condition: mock service and mock rc are replaced
kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'replaced'
kube::test::get_object_assert 'rc mock' "{{${labels_field}.status}}" 'replaced'
# Command
kubectl label -f hack/testdata/multi-resource.json labeled=true "${kube_flags[@]}"
# Post-condition: mock service and mock rc are labeled
kube::test::get_object_assert 'services mock' "{{${labels_field}.labeled}}" 'true'
kube::test::get_object_assert 'rc mock' "{{${labels_field}.labeled}}" 'true'
# Command
kubectl annotate -f hack/testdata/multi-resource.json annotated=true "${kube_flags[@]}"
# Post-condition: mock service and mock rc are annotated
kube::test::get_object_assert 'services mock' "{{${annotations_field}.annotated}}" 'true'
kube::test::get_object_assert 'rc mock' "{{${annotations_field}.annotated}}" 'true'
# Cleanup services and rc
kubectl delete -f hack/testdata/multi-resource.json "${kube_flags[@]}"
FILES="hack/testdata/multi-resource-yaml
hack/testdata/multi-resource-list
hack/testdata/multi-resource-json
hack/testdata/multi-resource-rclist
hack/testdata/multi-resource-svclist"
YAML=".yaml"
JSON=".json"
for file in $FILES; do
if [ -f $file$YAML ]
then
file=$file$YAML
replace_file="${file%.yaml}-modify.yaml"
else
file=$file$JSON
replace_file="${file%.json}-modify.json"
fi

has_svc=true
has_rc=true
two_rcs=false
two_svcs=false
if [[ "${file}" == *rclist* ]]; then
has_svc=false
two_rcs=true
fi
if [[ "${file}" == *svclist* ]]; then
has_rc=false
two_svcs=true
fi

### Create, get, describe, replace, label, annotate, and then delete service nginxsvc and replication controller my-nginx from 5 types of files:
### 1) YAML, separated by ---; 2) JSON, with a List type; 3) JSON, with JSON object concatenation
### 4) JSON, with a ReplicationControllerList type; 5) JSON, with a ServiceList type
echo "Testing with file ${file} and replace with file ${replace_file}"
# Pre-condition: no service (other than default kubernetes services) or replication controller is running
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[@]}"
# Post-condition: mock service (and mock2) is running
if [ "$has_svc" = true ]; then
if [ "$two_svcs" = true ]; then
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:mock:mock2:'
else
kube::test::get_object_assert services "{{range.items}}{{$id_field}}:{{end}}" 'kubernetes:mock:'
fi
fi
# Post-condition: mock rc (and mock2) is running
if [ "$has_rc" = true ]; then
if [ "$two_rcs" = true ]; then
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'mock:mock2:'
else
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" 'mock:'
fi
fi
# Command
# kubectl create -f $file "${kube_flags[@]}" # test fails here now
# TODO: test get when PR "Fix get with List #14888" is merged
# 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[@]}"
# 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'
if [ "$two_svcs" = true ]; then
kube::test::get_object_assert 'services mock2' "{{${labels_field}.status}}" 'replaced'
fi
fi
if [ "$has_rc" = true ]; then
kube::test::get_object_assert 'rc mock' "{{${labels_field}.status}}" 'replaced'
if [ "$two_rcs" = true ]; then
kube::test::get_object_assert 'rc mock2' "{{${labels_field}.status}}" 'replaced'
fi
fi
# Command: kubectl edit multiple resources
temp_editor="${KUBE_TEMP}/tmp-editor.sh"
echo -e '#!/bin/bash\nsed -i "s/status\:\ replaced/status\:\ edited/g" $@' > "${temp_editor}"
chmod +x "${temp_editor}"
EDITOR="${temp_editor}" kubectl edit "${kube_flags[@]}" -f "${file}"
# Post-condition: mock service (and mock2) and mock rc (and mock2) are edited
if [ "$has_svc" = true ]; then
kube::test::get_object_assert 'services mock' "{{${labels_field}.status}}" 'edited'
if [ "$two_svcs" = true ]; then
kube::test::get_object_assert 'services mock2' "{{${labels_field}.status}}" 'edited'
fi
fi
if [ "$has_rc" = true ]; then
kube::test::get_object_assert 'rc mock' "{{${labels_field}.status}}" 'edited'
if [ "$two_rcs" = true ]; then
kube::test::get_object_assert 'rc mock2' "{{${labels_field}.status}}" 'edited'
fi
fi
# cleaning
rm "${temp_editor}"
# Command
kubectl label -f "${file}" labeled=true "${kube_flags[@]}"
# Post-condition: mock service and mock rc (and mock2) are labeled
if [ "$has_svc" = true ]; then
kube::test::get_object_assert 'services mock' "{{${labels_field}.labeled}}" 'true'
if [ "$two_svcs" = true ]; then
kube::test::get_object_assert 'services mock2' "{{${labels_field}.labeled}}" 'true'
fi
fi
if [ "$has_rc" = true ]; then
kube::test::get_object_assert 'rc mock' "{{${labels_field}.labeled}}" 'true'
if [ "$two_rcs" = true ]; then
kube::test::get_object_assert 'rc mock2' "{{${labels_field}.labeled}}" 'true'
fi
fi
# Command
kubectl annotate -f "${file}" annotated=true "${kube_flags[@]}"
# Post-condition: mock service (and mock2) and mock rc (and mock2) are annotated
if [ "$has_svc" = true ]; then
kube::test::get_object_assert 'services mock' "{{${annotations_field}.annotated}}" 'true'
if [ "$two_svcs" = true ]; then
kube::test::get_object_assert 'services mock2' "{{${annotations_field}.annotated}}" 'true'
fi
fi
if [ "$has_rc" = true ]; then
kube::test::get_object_assert 'rc mock' "{{${annotations_field}.annotated}}" 'true'
if [ "$two_rcs" = true ]; then
kube::test::get_object_assert 'rc mock2' "{{${annotations_field}.annotated}}" 'true'
fi
fi
# Cleanup resources created
kubectl delete -f "${file}" "${kube_flags[@]}"
done

######################
# Persistent Volumes #
Expand Down
0 hack/testdata/multi-resource-modify.json → .../testdata/multi-resource-json-modify.json
View file
Open in desktop
File renamed without changes.
0 hack/testdata/multi-resource.json → hack/testdata/multi-resource-json.json
View file
Open in desktop
File renamed without changes.
70 changes: 70 additions & 0 deletions hack/testdata/multi-resource-rclist-modify.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"kind":"ReplicationControllerList",
"apiVersion":"v1",
"items":[
{
"metadata":{
"name":"mock",
"labels":{
"app":"mock",
"status":"replaced"
}
},
"spec":{
"replicas":1,
"selector":{
"app":"mock"
},
"template":{
"metadata":{
"labels":{
"app":"mock"
}
},
"spec":{
"containers":[{
"name": "mock-container",
"image": "kubernetes/pause",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
}]
}]
}
}
}
},
{
"metadata":{
"name":"mock2",
"labels":{
"app":"mock2",
"status":"replaced"
}
},
"spec":{
"replicas":1,
"selector":{
"app":"mock2"
},
"template":{
"metadata":{
"labels":{
"app":"mock2"
}
},
"spec":{
"containers":[{
"name": "mock-container",
"image": "kubernetes/pause",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
}]
}]
}
}
}
}
]
}
70 changes: 70 additions & 0 deletions hack/testdata/multi-resource-rclist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"kind":"ReplicationControllerList",
"apiVersion":"v1",
"items":[
{
"metadata":{
"name":"mock",
"labels":{
"app":"mock",
"status":"replaced"
}
},
"spec":{
"replicas":1,
"selector":{
"app":"mock"
},
"template":{
"metadata":{
"labels":{
"app":"mock"
}
},
"spec":{
"containers":[{
"name": "mock-container",
"image": "kubernetes/pause",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
}]
}]
}
}
}
},
{
"metadata":{
"name":"mock2",
"labels":{
"app":"mock2",
"status":"replaced"
}
},
"spec":{
"replicas":1,
"selector":{
"app":"mock2"
},
"template":{
"metadata":{
"labels":{
"app":"mock2"
}
},
"spec":{
"containers":[{
"name": "mock-container",
"image": "kubernetes/pause",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
}]
}]
}
}
}
}
]
}