From 694630724a1e5036d35ed9c12dc97dd2989d15d6 Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Sun, 1 Oct 2017 21:09:32 +0530 Subject: [PATCH] Rename TPR to CRD to be consistent TPR has been completely removed. We should rename TPR to CRD to be consistent with the nomenclature. --- hack/make-rules/test-cmd-util.sh | 87 +++++++++---------- hack/testdata/{TPR => CRD}/bar.yaml | 0 .../{TPR => CRD}/foo-added-subfield.yaml | 0 .../{TPR => CRD}/foo-deleted-subfield.yaml | 0 .../{TPR => CRD}/foo-updated-subfield.yaml | 0 hack/testdata/{TPR => CRD}/foo.yaml | 0 .../multi-crd-list-added-field.yaml} | 0 .../multi-crd-list-deleted-field.yaml} | 0 .../multi-crd-list-updated-field.yaml} | 0 .../multi-crd-list.yaml} | 0 .../crdregistration_controller.go | 8 +- 11 files changed, 46 insertions(+), 49 deletions(-) rename hack/testdata/{TPR => CRD}/bar.yaml (100%) rename hack/testdata/{TPR => CRD}/foo-added-subfield.yaml (100%) rename hack/testdata/{TPR => CRD}/foo-deleted-subfield.yaml (100%) rename hack/testdata/{TPR => CRD}/foo-updated-subfield.yaml (100%) rename hack/testdata/{TPR => CRD}/foo.yaml (100%) rename hack/testdata/{TPR/multi-tpr-list-added-field.yaml => CRD/multi-crd-list-added-field.yaml} (100%) rename hack/testdata/{TPR/multi-tpr-list-deleted-field.yaml => CRD/multi-crd-list-deleted-field.yaml} (100%) rename hack/testdata/{TPR/multi-tpr-list-updated-field.yaml => CRD/multi-crd-list-updated-field.yaml} (100%) rename hack/testdata/{TPR/multi-tpr-list.yaml => CRD/multi-crd-list.yaml} (100%) diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index a46f07b84a4..a80773b71f9 100755 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -74,7 +74,6 @@ static="static" storageclass="storageclass" subjectaccessreviews="subjectaccessreviews" selfsubjectaccessreviews="selfsubjectaccessreviews" -thirdpartyresources="thirdpartyresources" customresourcedefinitions="customresourcedefinitions" daemonsets="daemonsets" controllerrevisions="controllerrevisions" @@ -1542,16 +1541,16 @@ run_non_native_resource_tests() { kube::log::status "Testing kubectl non-native resources" kube::util::non_native_resources - # Test that we can list this new third party resource (foos) + # Test that we can list this new CustomResource (foos) kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' - # Test that we can list this new third party resource (bars) + # Test that we can list this new CustomResource (bars) kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" '' # Test that we can create a new resource of type Foo - kubectl "${kube_flags[@]}" create -f hack/testdata/TPR/foo.yaml "${kube_flags[@]}" + kubectl "${kube_flags[@]}" create -f hack/testdata/CRD/foo.yaml "${kube_flags[@]}" - # Test that we can list this new third party resource + # Test that we can list this new custom resource kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test:' # Test alternate forms @@ -1560,7 +1559,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert foos.v1.company.com "{{range.items}}{{$id_field}}:{{end}}" 'test:' # Test all printers, with lists and individual items - kube::log::status "Testing ThirdPartyResource printing" + kube::log::status "Testing CustomResource printing" kubectl "${kube_flags[@]}" get foos kubectl "${kube_flags[@]}" get foos/test kubectl "${kube_flags[@]}" get foos -o name @@ -1579,7 +1578,7 @@ run_non_native_resource_tests() { kube::test::if_has_string "${output_message}" 'foos/test' # Test patching - kube::log::status "Testing ThirdPartyResource patching" + kube::log::status "Testing CustomResource patching" kubectl "${kube_flags[@]}" patch foos/test -p '{"patched":"value1"}' --type=merge kube::test::get_object_assert foos/test "{{.patched}}" 'value1' kubectl "${kube_flags[@]}" patch foos/test -p '{"patched":"value2"}' --type=merge --record @@ -1587,37 +1586,37 @@ run_non_native_resource_tests() { kubectl "${kube_flags[@]}" patch foos/test -p '{"patched":null}' --type=merge --record kube::test::get_object_assert foos/test "{{.patched}}" '' # Get local version - TPR_RESOURCE_FILE="${KUBE_TEMP}/tpr-foos-test.json" - kubectl "${kube_flags[@]}" get foos/test -o json > "${TPR_RESOURCE_FILE}" + CRD_RESOURCE_FILE="${KUBE_TEMP}/crd-foos-test.json" + kubectl "${kube_flags[@]}" get foos/test -o json > "${CRD_RESOURCE_FILE}" # cannot apply strategic patch locally - TPR_PATCH_ERROR_FILE="${KUBE_TEMP}/tpr-foos-test-error" - ! kubectl "${kube_flags[@]}" patch --local -f "${TPR_RESOURCE_FILE}" -p '{"patched":"value3"}' 2> "${TPR_PATCH_ERROR_FILE}" - if grep -q "try --type merge" "${TPR_PATCH_ERROR_FILE}"; then - kube::log::status "\"kubectl patch --local\" returns error as expected for ThirdPartyResource: $(cat ${TPR_PATCH_ERROR_FILE})" + CRD_PATCH_ERROR_FILE="${KUBE_TEMP}/crd-foos-test-error" + ! kubectl "${kube_flags[@]}" patch --local -f "${CRD_RESOURCE_FILE}" -p '{"patched":"value3"}' 2> "${CRD_PATCH_ERROR_FILE}" + if grep -q "try --type merge" "${CRD_PATCH_ERROR_FILE}"; then + kube::log::status "\"kubectl patch --local\" returns error as expected for CustomResource: $(cat ${CRD_PATCH_ERROR_FILE})" else - kube::log::status "\"kubectl patch --local\" returns unexpected error or non-error: $(cat ${TPR_PATCH_ERROR_FILE})" + kube::log::status "\"kubectl patch --local\" returns unexpected error or non-error: $(cat ${CRD_PATCH_ERROR_FILE})" exit 1 fi # can apply merge patch locally - kubectl "${kube_flags[@]}" patch --local -f "${TPR_RESOURCE_FILE}" -p '{"patched":"value3"}' --type=merge -o json + kubectl "${kube_flags[@]}" patch --local -f "${CRD_RESOURCE_FILE}" -p '{"patched":"value3"}' --type=merge -o json # can apply merge patch remotely - kubectl "${kube_flags[@]}" patch --record -f "${TPR_RESOURCE_FILE}" -p '{"patched":"value3"}' --type=merge -o json + kubectl "${kube_flags[@]}" patch --record -f "${CRD_RESOURCE_FILE}" -p '{"patched":"value3"}' --type=merge -o json kube::test::get_object_assert foos/test "{{.patched}}" 'value3' - rm "${TPR_RESOURCE_FILE}" - rm "${TPR_PATCH_ERROR_FILE}" + rm "${CRD_RESOURCE_FILE}" + rm "${CRD_PATCH_ERROR_FILE}" # Test labeling - kube::log::status "Testing ThirdPartyResource labeling" + kube::log::status "Testing CustomResource labeling" kubectl "${kube_flags[@]}" label foos --all listlabel=true kubectl "${kube_flags[@]}" label foo/test itemlabel=true # Test annotating - kube::log::status "Testing ThirdPartyResource annotating" + kube::log::status "Testing CustomResource annotating" kubectl "${kube_flags[@]}" annotate foos --all listannotation=true kubectl "${kube_flags[@]}" annotate foo/test itemannotation=true # Test describing - kube::log::status "Testing ThirdPartyResource describing" + kube::log::status "Testing CustomResource describing" kubectl "${kube_flags[@]}" describe foos kubectl "${kube_flags[@]}" describe foos/test kubectl "${kube_flags[@]}" describe foos | grep listlabel=true @@ -1630,15 +1629,15 @@ run_non_native_resource_tests() { kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' # Test that we can create a new resource of type Bar - kubectl "${kube_flags[@]}" create -f hack/testdata/TPR/bar.yaml "${kube_flags[@]}" + kubectl "${kube_flags[@]}" create -f hack/testdata/CRD/bar.yaml "${kube_flags[@]}" - # Test that we can list this new third party resource + # Test that we can list this new custom resource kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" 'test:' # Test that we can watch the resource. # Start watcher in background with process substitution, # so we can read from stdout asynchronously. - kube::log::status "Testing ThirdPartyResource watching" + kube::log::status "Testing CustomResource watching" exec 3< <(kubectl "${kube_flags[@]}" get bars --request-timeout=1m --watch-only -o name & echo $! ; wait) local watch_pid read <&3 watch_pid @@ -1668,7 +1667,7 @@ run_non_native_resource_tests() { kube::test::wait_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" '' # Test that we can create single item via apply - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/foo.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/foo.yaml # Test that we have create a foo named test kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test:' @@ -1677,7 +1676,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert foos/test '{{.someField}}' 'field1' # Test that apply an empty patch doesn't change fields - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/foo.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/foo.yaml # Test that the field has the same value after re-apply kube::test::get_object_assert foos/test '{{.someField}}' 'field1' @@ -1686,7 +1685,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert foos/test '{{.nestedField.someSubfield}}' 'subfield1' # Update a subfield and then apply the change - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/foo-updated-subfield.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/foo-updated-subfield.yaml # Test that apply has updated the subfield kube::test::get_object_assert foos/test '{{.nestedField.someSubfield}}' 'modifiedSubfield' @@ -1695,7 +1694,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert foos/test '{{.nestedField.otherSubfield}}' 'subfield2' # Delete a subfield and then apply the change - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/foo-deleted-subfield.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/foo-deleted-subfield.yaml # Test that apply has deleted the field kube::test::get_object_assert foos/test '{{.nestedField.otherSubfield}}' '' @@ -1704,19 +1703,19 @@ run_non_native_resource_tests() { kube::test::get_object_assert foos/test '{{.nestedField.newSubfield}}' '' # Add a field and then apply the change - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/foo-added-subfield.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/foo-added-subfield.yaml # Test that apply has added the field kube::test::get_object_assert foos/test '{{.nestedField.newSubfield}}' 'subfield3' # Delete the resource - kubectl "${kube_flags[@]}" delete -f hack/testdata/TPR/foo.yaml + kubectl "${kube_flags[@]}" delete -f hack/testdata/CRD/foo.yaml # Make sure it's gone kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' # Test that we can create list via apply - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/multi-tpr-list.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/multi-crd-list.yaml # Test that we have create a foo and a bar from a list kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test-list:' @@ -1727,7 +1726,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert bars/test-list '{{.someField}}' 'field1' # Test that re-apply an list doesn't change anything - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/multi-tpr-list.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/multi-crd-list.yaml # Test that the field has the same value after re-apply kube::test::get_object_assert foos/test-list '{{.someField}}' 'field1' @@ -1738,7 +1737,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert bars/test-list '{{.someField}}' 'field1' # Update fields and then apply the change - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/multi-tpr-list-updated-field.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/multi-crd-list-updated-field.yaml # Test that apply has updated the fields kube::test::get_object_assert foos/test-list '{{.someField}}' 'modifiedField' @@ -1749,7 +1748,7 @@ run_non_native_resource_tests() { kube::test::get_object_assert bars/test-list '{{.otherField}}' 'field2' # Delete fields and then apply the change - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/multi-tpr-list-deleted-field.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/multi-crd-list-deleted-field.yaml # Test that apply has deleted the fields kube::test::get_object_assert foos/test-list '{{.otherField}}' '' @@ -1760,14 +1759,14 @@ run_non_native_resource_tests() { kube::test::get_object_assert bars/test-list '{{.newField}}' '' # Add a field and then apply the change - kubectl "${kube_flags[@]}" apply -f hack/testdata/TPR/multi-tpr-list-added-field.yaml + kubectl "${kube_flags[@]}" apply -f hack/testdata/CRD/multi-crd-list-added-field.yaml # Test that apply has added the field kube::test::get_object_assert foos/test-list '{{.newField}}' 'field3' kube::test::get_object_assert bars/test-list '{{.newField}}' 'field3' # Delete the resource - kubectl "${kube_flags[@]}" delete -f hack/testdata/TPR/multi-tpr-list.yaml + kubectl "${kube_flags[@]}" delete -f hack/testdata/CRD/multi-crd-list.yaml # Make sure it's gone kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' @@ -1779,19 +1778,19 @@ run_non_native_resource_tests() { kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" '' # apply --prune on foo.yaml that has foo/test - kubectl apply --prune -l pruneGroup=true -f hack/testdata/TPR/foo.yaml "${kube_flags[@]}" --prune-whitelist=company.com/v1/Foo --prune-whitelist=company.com/v1/Bar - # check right tprs exist + kubectl apply --prune -l pruneGroup=true -f hack/testdata/CRD/foo.yaml "${kube_flags[@]}" --prune-whitelist=company.com/v1/Foo --prune-whitelist=company.com/v1/Bar + # check right crds exist kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test:' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" '' # apply --prune on bar.yaml that has bar/test - kubectl apply --prune -l pruneGroup=true -f hack/testdata/TPR/bar.yaml "${kube_flags[@]}" --prune-whitelist=company.com/v1/Foo --prune-whitelist=company.com/v1/Bar - # check right tprs exist + kubectl apply --prune -l pruneGroup=true -f hack/testdata/CRD/bar.yaml "${kube_flags[@]}" --prune-whitelist=company.com/v1/Foo --prune-whitelist=company.com/v1/Bar + # check right crds exist kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" 'test:' # Delete the resource - kubectl "${kube_flags[@]}" delete -f hack/testdata/TPR/bar.yaml + kubectl "${kube_flags[@]}" delete -f hack/testdata/CRD/bar.yaml # Make sure it's gone kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' @@ -1799,7 +1798,7 @@ run_non_native_resource_tests() { # Test 'kubectl create' with namespace, and namespace cleanup. kubectl "${kube_flags[@]}" create namespace non-native-resources - kubectl "${kube_flags[@]}" create -f hack/testdata/TPR/bar.yaml --namespace=non-native-resources + kubectl "${kube_flags[@]}" create -f hack/testdata/CRD/bar.yaml --namespace=non-native-resources kube::test::get_object_assert bars '{{len .items}}' '1' --namespace=non-native-resources kubectl "${kube_flags[@]}" delete namespace non-native-resources # Make sure objects go away. @@ -4518,10 +4517,10 @@ runTests() { fi ##################################### - # Third Party Resources # + # CustomResourceDefinitions # ##################################### - # customresourcedefinitions cleanup after themselves. Run these first, then TPRs + # customresourcedefinitions cleanup after themselves. if kube::test::if_supports_resource "${customresourcedefinitions}" ; then record_command run_crd_tests fi diff --git a/hack/testdata/TPR/bar.yaml b/hack/testdata/CRD/bar.yaml similarity index 100% rename from hack/testdata/TPR/bar.yaml rename to hack/testdata/CRD/bar.yaml diff --git a/hack/testdata/TPR/foo-added-subfield.yaml b/hack/testdata/CRD/foo-added-subfield.yaml similarity index 100% rename from hack/testdata/TPR/foo-added-subfield.yaml rename to hack/testdata/CRD/foo-added-subfield.yaml diff --git a/hack/testdata/TPR/foo-deleted-subfield.yaml b/hack/testdata/CRD/foo-deleted-subfield.yaml similarity index 100% rename from hack/testdata/TPR/foo-deleted-subfield.yaml rename to hack/testdata/CRD/foo-deleted-subfield.yaml diff --git a/hack/testdata/TPR/foo-updated-subfield.yaml b/hack/testdata/CRD/foo-updated-subfield.yaml similarity index 100% rename from hack/testdata/TPR/foo-updated-subfield.yaml rename to hack/testdata/CRD/foo-updated-subfield.yaml diff --git a/hack/testdata/TPR/foo.yaml b/hack/testdata/CRD/foo.yaml similarity index 100% rename from hack/testdata/TPR/foo.yaml rename to hack/testdata/CRD/foo.yaml diff --git a/hack/testdata/TPR/multi-tpr-list-added-field.yaml b/hack/testdata/CRD/multi-crd-list-added-field.yaml similarity index 100% rename from hack/testdata/TPR/multi-tpr-list-added-field.yaml rename to hack/testdata/CRD/multi-crd-list-added-field.yaml diff --git a/hack/testdata/TPR/multi-tpr-list-deleted-field.yaml b/hack/testdata/CRD/multi-crd-list-deleted-field.yaml similarity index 100% rename from hack/testdata/TPR/multi-tpr-list-deleted-field.yaml rename to hack/testdata/CRD/multi-crd-list-deleted-field.yaml diff --git a/hack/testdata/TPR/multi-tpr-list-updated-field.yaml b/hack/testdata/CRD/multi-crd-list-updated-field.yaml similarity index 100% rename from hack/testdata/TPR/multi-tpr-list-updated-field.yaml rename to hack/testdata/CRD/multi-crd-list-updated-field.yaml diff --git a/hack/testdata/TPR/multi-tpr-list.yaml b/hack/testdata/CRD/multi-crd-list.yaml similarity index 100% rename from hack/testdata/TPR/multi-tpr-list.yaml rename to hack/testdata/CRD/multi-crd-list.yaml diff --git a/pkg/master/controller/crdregistration/crdregistration_controller.go b/pkg/master/controller/crdregistration/crdregistration_controller.go index 5323206f9d6..c3a87b418a4 100644 --- a/pkg/master/controller/crdregistration/crdregistration_controller.go +++ b/pkg/master/controller/crdregistration/crdregistration_controller.go @@ -60,10 +60,8 @@ type crdRegistrationController struct { queue workqueue.RateLimitingInterface } -// NewAutoRegistrationController returns a controller which will register TPR GroupVersions with the auto APIService registration +// NewAutoRegistrationController returns a controller which will register CRD GroupVersions with the auto APIService registration // controller so they automatically stay in sync. -// In order to stay sane with both TPR and CRD present, we have a single controller that manages both. When choosing whether to have an -// APIService, we simply iterate through both. func NewAutoRegistrationController(crdinformer crdinformers.CustomResourceDefinitionInformer, apiServiceRegistration AutoAPIServiceRegistration) *crdRegistrationController { c := &crdRegistrationController{ crdLister: crdinformer.Lister(), @@ -213,8 +211,8 @@ func (c *crdRegistrationController) handleVersionUpdate(groupVersion schema.Grou Spec: apiregistration.APIServiceSpec{ Group: groupVersion.Group, Version: groupVersion.Version, - GroupPriorityMinimum: 1000, // TPRs should have relatively low priority - VersionPriority: 100, // TPRs should have relatively low priority + GroupPriorityMinimum: 1000, // CRDs should have relatively low priority + VersionPriority: 100, // CRDs should have relatively low priority }, })