github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4793 from mikedanese/patch-test-fix

Browse Source 
Fix bad hack/cmd-test.sh case for --patch
This commit is contained in:
Zach Loafman 2015-02-26 14:39:36 -08:00
commit b723f0873c
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hack/test-cmd.sh
View File

@ -376,26 +376,18 @@ for version in "${kube_api_versions[@]}"; do
"apiVersion": "v1beta1", "apiVersion": "v1beta1",
"id": "service-${version}-test", "id": "service-${version}-test",
"port": 80, "port": 80,
"protocol": "TCP", "protocol": "TCP"
"selector": {
"version": "old"
}
} }
__EOF__ __EOF__
# Post-condition:redis-master-service service is running # Post-condition:redis-master-service service is running
kube::test::get_object_assert services '{{range.items}}{{.id}}:{{end}}' 'kubernetes:kubernetes-ro:redis-master:service-.*-test:' kube::test::get_object_assert services '{{range.items}}{{.id}}:{{end}}' 'kubernetes:kubernetes-ro:redis-master:service-.*-test:'
### Update selector of service-${version}-test
# Pre-condition: selector.version == old
kube::test::get_object_assert "service service-${version}-test" "{{range.selector}}{{.}}{{end}}" 'old'
# Command # Command
kubectl update service "${kube_flags[@]}" service-${version}-test --patch="{\"selector\":{\"version\":\"${version}\"},\"apiVersion\":\"${version}\"}" kubectl update service "${kube_flags[@]}" service-${version}-test --patch="{\"selector\":{\"my\":\"test-label\"},\"apiVersion\":\"v1beta1\"}"
# Post-condition: selector.version == ${version} # Post-condition: selector.version == ${version}
# This test works only in v1beta1 and v1beta2 # This test works only in v1beta1 and v1beta2
# https://github.com/GoogleCloudPlatform/kubernetes/issues/4771 # https://github.com/GoogleCloudPlatform/kubernetes/issues/4771
if [[ "$version" != "" ]] && [[ "$version" != "v1beta3" ]]; then kube::test::get_object_assert "service service-${version}-test" "{{range.selector}}{{.}}{{end}}" "test-label"
kube::test::get_object_assert "service service-${version}-test" "{{range.selector}}{{.}}{{end}}" "${version}"
fi
### Identity ### Identity
kubectl get service "${kube_flags[@]}" service-${version}-test -o json | kubectl update "${kube_flags[@]}" -f - kubectl get service "${kube_flags[@]}" service-${version}-test -o json | kubectl update "${kube_flags[@]}" -f -