remove tpr API access
This commit is contained in:
@@ -1492,161 +1492,6 @@ __EOF__
|
||||
set +o errexit
|
||||
}
|
||||
|
||||
run_tpr_tests() {
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
create_and_use_new_namespace
|
||||
kube::log::status "Testing kubectl tpr"
|
||||
kubectl "${kube_flags[@]}" create -f - "${kube_flags[@]}" << __EOF__
|
||||
{
|
||||
"kind": "ThirdPartyResource",
|
||||
"apiVersion": "extensions/v1beta1",
|
||||
"metadata": {
|
||||
"name": "foo.company.com"
|
||||
},
|
||||
"versions": [
|
||||
{
|
||||
"name": "v1"
|
||||
}
|
||||
]
|
||||
}
|
||||
__EOF__
|
||||
|
||||
# Post-Condition: assertion object exist
|
||||
kube::test::get_object_assert thirdpartyresources "{{range.items}}{{$id_field}}:{{end}}" 'foo.company.com:'
|
||||
|
||||
kubectl "${kube_flags[@]}" create -f - "${kube_flags[@]}" << __EOF__
|
||||
{
|
||||
"kind": "ThirdPartyResource",
|
||||
"apiVersion": "extensions/v1beta1",
|
||||
"metadata": {
|
||||
"name": "bar.company.com"
|
||||
},
|
||||
"versions": [
|
||||
{
|
||||
"name": "v1"
|
||||
}
|
||||
]
|
||||
}
|
||||
__EOF__
|
||||
|
||||
# Post-Condition: assertion object exist
|
||||
kube::test::get_object_assert thirdpartyresources "{{range.items}}{{$id_field}}:{{end}}" 'bar.company.com:foo.company.com:'
|
||||
|
||||
run_non_native_resource_tests
|
||||
|
||||
# teardown
|
||||
kubectl delete thirdpartyresources/foo.company.com "${kube_flags[@]}"
|
||||
kubectl delete thirdpartyresources/bar.company.com "${kube_flags[@]}"
|
||||
|
||||
set +o nounset
|
||||
set +o errexit
|
||||
}
|
||||
|
||||
run_tpr_migration_tests() {
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
|
||||
kube::log::status "Testing kubectl tpr migration"
|
||||
local i tries
|
||||
create_and_use_new_namespace
|
||||
|
||||
# Create CRD first. This is sort of backwards so we can create a marker below.
|
||||
kubectl "${kube_flags_with_token[@]}" create -f - << __EOF__
|
||||
{
|
||||
"kind": "CustomResourceDefinition",
|
||||
"apiVersion": "apiextensions.k8s.io/v1beta1",
|
||||
"metadata": {
|
||||
"name": "foos.company.crd"
|
||||
},
|
||||
"spec": {
|
||||
"group": "company.crd",
|
||||
"version": "v1",
|
||||
"names": {
|
||||
"plural": "foos",
|
||||
"kind": "Foo"
|
||||
}
|
||||
}
|
||||
}
|
||||
__EOF__
|
||||
# Wait for API to become available.
|
||||
tries=0
|
||||
until kubectl "${kube_flags[@]}" get foos.company.crd || [ $tries -gt 10 ]; do
|
||||
tries=$((tries+1))
|
||||
sleep ${tries}
|
||||
done
|
||||
kube::test::get_object_assert foos.company.crd '{{len .items}}' '0'
|
||||
|
||||
# Create a marker that only exists in CRD so we know when CRD is active vs. TPR.
|
||||
kubectl "${kube_flags[@]}" create -f - << __EOF__
|
||||
{
|
||||
"kind": "Foo",
|
||||
"apiVersion": "company.crd/v1",
|
||||
"metadata": {
|
||||
"name": "crd-marker"
|
||||
},
|
||||
"testValue": "only exists in CRD"
|
||||
}
|
||||
__EOF__
|
||||
kube::test::get_object_assert foos.company.crd '{{len .items}}' '1'
|
||||
|
||||
# Now create a TPR that sits in front of the CRD and hides it.
|
||||
kubectl "${kube_flags[@]}" create -f - << __EOF__
|
||||
{
|
||||
"kind": "ThirdPartyResource",
|
||||
"apiVersion": "extensions/v1beta1",
|
||||
"metadata": {
|
||||
"name": "foo.company.crd"
|
||||
},
|
||||
"versions": [
|
||||
{
|
||||
"name": "v1"
|
||||
}
|
||||
]
|
||||
}
|
||||
__EOF__
|
||||
# The marker should disappear.
|
||||
kube::test::wait_object_assert foos.company.crd '{{len .items}}' '0'
|
||||
|
||||
# Add some items to the TPR.
|
||||
for i in {1..10}; do
|
||||
kubectl "${kube_flags[@]}" create -f - << __EOF__
|
||||
{
|
||||
"kind": "Foo",
|
||||
"apiVersion": "company.crd/v1",
|
||||
"metadata": {
|
||||
"name": "tpr-${i}"
|
||||
},
|
||||
"testValue": "migrate-${i}"
|
||||
}
|
||||
__EOF__
|
||||
done
|
||||
kube::test::get_object_assert foos.company.crd '{{len .items}}' '10'
|
||||
|
||||
# Delete the TPR and wait for the CRD to take over.
|
||||
kubectl "${kube_flags[@]}" delete thirdpartyresource/foo.company.crd
|
||||
tries=0
|
||||
until kubectl "${kube_flags[@]}" get foos.company.crd/crd-marker || [ $tries -gt 10 ]; do
|
||||
tries=$((tries+1))
|
||||
sleep ${tries}
|
||||
done
|
||||
kube::test::get_object_assert foos.company.crd/crd-marker '{{.testValue}}' 'only exists in CRD'
|
||||
|
||||
# Check if the TPR items were migrated to CRD.
|
||||
kube::test::get_object_assert foos.company.crd '{{len .items}}' '11'
|
||||
for i in {1..10}; do
|
||||
kube::test::get_object_assert foos.company.crd/tpr-${i} '{{.testValue}}' "migrate-${i}"
|
||||
done
|
||||
|
||||
# teardown
|
||||
kubectl delete customresourcedefinitions/foos.company.crd "${kube_flags_with_token[@]}"
|
||||
|
||||
set +o nounset
|
||||
set +o errexit
|
||||
}
|
||||
|
||||
|
||||
kube::util::non_native_resources() {
|
||||
local times
|
||||
local wait
|
||||
@@ -4455,13 +4300,6 @@ runTests() {
|
||||
record_command run_crd_tests
|
||||
fi
|
||||
|
||||
if kube::test::if_supports_resource "${thirdpartyresources}" ; then
|
||||
record_command run_tpr_tests
|
||||
if kube::test::if_supports_resource "${customresourcedefinitions}" ; then
|
||||
record_command run_tpr_migration_tests
|
||||
fi
|
||||
fi
|
||||
|
||||
#################
|
||||
# Run cmd w img #
|
||||
#################
|
||||
|
Reference in New Issue
Block a user