scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename TPR to CRD to be consistent

Browse Source 
TPR has been completely removed. We should rename TPR
to CRD to be consistent with the nomenclature.
This commit is contained in:
Nikhita Raghunath
2017-10-01 21:09:32 +05:30
parent cd37a28fa5
commit 694630724a
11 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
hack/make-rules/test-cmd-util.sh
View File

@@ -74,7 +74,6 @@ static="static"
storageclass="storageclass" storageclass="storageclass"
subjectaccessreviews="subjectaccessreviews" subjectaccessreviews="subjectaccessreviews"
selfsubjectaccessreviews="selfsubjectaccessreviews" selfsubjectaccessreviews="selfsubjectaccessreviews"
thirdpartyresources="thirdpartyresources"
customresourcedefinitions="customresourcedefinitions" customresourcedefinitions="customresourcedefinitions"
daemonsets="daemonsets" daemonsets="daemonsets"
controllerrevisions="controllerrevisions" controllerrevisions="controllerrevisions"
@@ -1542,16 +1541,16 @@ run_non_native_resource_tests() {
kube::log::status "Testing kubectl non-native resources" kube::log::status "Testing kubectl non-native resources"
kube::util::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}}" '' 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}}" '' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" ''
# Test that we can create a new resource of type Foo # 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:' kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test:'
# Test alternate forms # 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:' kube::test::get_object_assert foos.v1.company.com "{{range.items}}{{$id_field}}:{{end}}" 'test:'
# Test all printers, with lists and individual items # 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
kubectl "${kube_flags[@]}" get foos/test kubectl "${kube_flags[@]}" get foos/test
kubectl "${kube_flags[@]}" get foos -o name 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' kube::test::if_has_string "${output_message}" 'foos/test'
# Test patching # 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 kubectl "${kube_flags[@]}" patch foos/test -p '{"patched":"value1"}' --type=merge
kube::test::get_object_assert foos/test "{{.patched}}" 'value1' kube::test::get_object_assert foos/test "{{.patched}}" 'value1'
kubectl "${kube_flags[@]}" patch foos/test -p '{"patched":"value2"}' --type=merge --record 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 kubectl "${kube_flags[@]}" patch foos/test -p '{"patched":null}' --type=merge --record
kube::test::get_object_assert foos/test "{{.patched}}" '<no value>' kube::test::get_object_assert foos/test "{{.patched}}" '<no value>'
# Get local version # Get local version
TPR_RESOURCE_FILE="${KUBE_TEMP}/tpr-foos-test.json" CRD_RESOURCE_FILE="${KUBE_TEMP}/crd-foos-test.json"
kubectl "${kube_flags[@]}" get foos/test -o json > "${TPR_RESOURCE_FILE}" kubectl "${kube_flags[@]}" get foos/test -o json > "${CRD_RESOURCE_FILE}"
# cannot apply strategic patch locally # cannot apply strategic patch locally
TPR_PATCH_ERROR_FILE="${KUBE_TEMP}/tpr-foos-test-error" CRD_PATCH_ERROR_FILE="${KUBE_TEMP}/crd-foos-test-error"
! kubectl "${kube_flags[@]}" patch --local -f "${TPR_RESOURCE_FILE}" -p '{"patched":"value3"}' 2> "${TPR_PATCH_ERROR_FILE}" ! kubectl "${kube_flags[@]}" patch --local -f "${CRD_RESOURCE_FILE}" -p '{"patched":"value3"}' 2> "${CRD_PATCH_ERROR_FILE}"
if grep -q "try --type merge" "${TPR_PATCH_ERROR_FILE}"; then if grep -q "try --type merge" "${CRD_PATCH_ERROR_FILE}"; then
kube::log::status "\"kubectl patch --local\" returns error as expected for ThirdPartyResource: $(cat ${TPR_PATCH_ERROR_FILE})" kube::log::status "\"kubectl patch --local\" returns error as expected for CustomResource: $(cat ${CRD_PATCH_ERROR_FILE})"
else 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 exit 1
fi fi
# can apply merge patch locally # 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 # 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' kube::test::get_object_assert foos/test "{{.patched}}" 'value3'
rm "${TPR_RESOURCE_FILE}" rm "${CRD_RESOURCE_FILE}"
rm "${TPR_PATCH_ERROR_FILE}" rm "${CRD_PATCH_ERROR_FILE}"
# Test labeling # 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 foos --all listlabel=true
kubectl "${kube_flags[@]}" label foo/test itemlabel=true kubectl "${kube_flags[@]}" label foo/test itemlabel=true
# Test annotating # 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 foos --all listannotation=true
kubectl "${kube_flags[@]}" annotate foo/test itemannotation=true kubectl "${kube_flags[@]}" annotate foo/test itemannotation=true
# Test describing # Test describing
kube::log::status "Testing ThirdPartyResource describing" kube::log::status "Testing CustomResource describing"
kubectl "${kube_flags[@]}" describe foos kubectl "${kube_flags[@]}" describe foos
kubectl "${kube_flags[@]}" describe foos/test kubectl "${kube_flags[@]}" describe foos/test
kubectl "${kube_flags[@]}" describe foos | grep listlabel=true 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}}" '' kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" ''
# Test that we can create a new resource of type Bar # 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:' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" 'test:'
# Test that we can watch the resource. # Test that we can watch the resource.
# Start watcher in background with process substitution, # Start watcher in background with process substitution,
# so we can read from stdout asynchronously. # 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) exec 3< <(kubectl "${kube_flags[@]}" get bars --request-timeout=1m --watch-only -o name & echo $! ; wait)
local watch_pid local watch_pid
read <&3 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}}" '' kube::test::wait_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" ''
# Test that we can create single item via apply # 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 # Test that we have create a foo named test
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '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' kube::test::get_object_assert foos/test '{{.someField}}' 'field1'
# Test that apply an empty patch doesn't change fields # 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 # Test that the field has the same value after re-apply
kube::test::get_object_assert foos/test '{{.someField}}' 'field1' 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' kube::test::get_object_assert foos/test '{{.nestedField.someSubfield}}' 'subfield1'
# Update a subfield and then apply the change # 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 # Test that apply has updated the subfield
kube::test::get_object_assert foos/test '{{.nestedField.someSubfield}}' 'modifiedSubfield' 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' kube::test::get_object_assert foos/test '{{.nestedField.otherSubfield}}' 'subfield2'
# Delete a subfield and then apply the change # 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 # Test that apply has deleted the field
kube::test::get_object_assert foos/test '{{.nestedField.otherSubfield}}' '<no value>' kube::test::get_object_assert foos/test '{{.nestedField.otherSubfield}}' '<no value>'
@@ -1704,19 +1703,19 @@ run_non_native_resource_tests() {
kube::test::get_object_assert foos/test '{{.nestedField.newSubfield}}' '<no value>' kube::test::get_object_assert foos/test '{{.nestedField.newSubfield}}' '<no value>'
# Add a field and then apply the change # 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 # Test that apply has added the field
kube::test::get_object_assert foos/test '{{.nestedField.newSubfield}}' 'subfield3' kube::test::get_object_assert foos/test '{{.nestedField.newSubfield}}' 'subfield3'
# Delete the resource # 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 # Make sure it's gone
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" ''
# Test that we can create list via apply # 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 # 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:' 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' kube::test::get_object_assert bars/test-list '{{.someField}}' 'field1'
# Test that re-apply an list doesn't change anything # 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 # Test that the field has the same value after re-apply
kube::test::get_object_assert foos/test-list '{{.someField}}' 'field1' 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' kube::test::get_object_assert bars/test-list '{{.someField}}' 'field1'
# Update fields and then apply the change # 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 # Test that apply has updated the fields
kube::test::get_object_assert foos/test-list '{{.someField}}' 'modifiedField' 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' kube::test::get_object_assert bars/test-list '{{.otherField}}' 'field2'
# Delete fields and then apply the change # 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 # Test that apply has deleted the fields
kube::test::get_object_assert foos/test-list '{{.otherField}}' '<no value>' kube::test::get_object_assert foos/test-list '{{.otherField}}' '<no value>'
@@ -1760,14 +1759,14 @@ run_non_native_resource_tests() {
kube::test::get_object_assert bars/test-list '{{.newField}}' '<no value>' kube::test::get_object_assert bars/test-list '{{.newField}}' '<no value>'
# Add a field and then apply the change # 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 # Test that apply has added the field
kube::test::get_object_assert foos/test-list '{{.newField}}' 'field3' kube::test::get_object_assert foos/test-list '{{.newField}}' 'field3'
kube::test::get_object_assert bars/test-list '{{.newField}}' 'field3' kube::test::get_object_assert bars/test-list '{{.newField}}' 'field3'
# Delete the resource # 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 # Make sure it's gone
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' 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}}" '' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" ''
# apply --prune on foo.yaml that has foo/test # 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 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 tprs exist # check right crds exist
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test:' kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" 'test:'
kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" ''
# apply --prune on bar.yaml that has bar/test # 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 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 tprs exist # check right crds exist
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" ''
kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" 'test:' kube::test::get_object_assert bars "{{range.items}}{{$id_field}}:{{end}}" 'test:'
# Delete the resource # 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 # Make sure it's gone
kube::test::get_object_assert foos "{{range.items}}{{$id_field}}:{{end}}" '' 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. # Test 'kubectl create' with namespace, and namespace cleanup.
kubectl "${kube_flags[@]}" create namespace non-native-resources 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 kube::test::get_object_assert bars '{{len .items}}' '1' --namespace=non-native-resources
kubectl "${kube_flags[@]}" delete namespace non-native-resources kubectl "${kube_flags[@]}" delete namespace non-native-resources
# Make sure objects go away. # Make sure objects go away.
@@ -4518,10 +4517,10 @@ runTests() {
fi 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 if kube::test::if_supports_resource "${customresourcedefinitions}" ; then
record_command run_crd_tests record_command run_crd_tests
fi fi

0
hack/testdata/TPR/bar.yaml → hack/testdata/CRD/bar.yaml vendored
View File

0
hack/testdata/TPR/foo-added-subfield.yaml → hack/testdata/CRD/foo-added-subfield.yaml vendored
View File

0
hack/testdata/TPR/foo-deleted-subfield.yaml → hack/testdata/CRD/foo-deleted-subfield.yaml vendored
View File

0
hack/testdata/TPR/foo-updated-subfield.yaml → hack/testdata/CRD/foo-updated-subfield.yaml vendored
View File

0
hack/testdata/TPR/foo.yaml → hack/testdata/CRD/foo.yaml vendored
View File

0
hack/testdata/TPR/multi-tpr-list-added-field.yaml → hack/testdata/CRD/multi-crd-list-added-field.yaml vendored
View File

0
hack/testdata/TPR/multi-tpr-list-deleted-field.yaml → hack/testdata/CRD/multi-crd-list-deleted-field.yaml vendored
View File

0
hack/testdata/TPR/multi-tpr-list-updated-field.yaml → hack/testdata/CRD/multi-crd-list-updated-field.yaml vendored
View File

0
hack/testdata/TPR/multi-tpr-list.yaml → hack/testdata/CRD/multi-crd-list.yaml vendored
View File

8
pkg/master/controller/crdregistration/crdregistration_controller.go
View File

@@ -60,10 +60,8 @@ type crdRegistrationController struct {
queue workqueue.RateLimitingInterface 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. // 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 { func NewAutoRegistrationController(crdinformer crdinformers.CustomResourceDefinitionInformer, apiServiceRegistration AutoAPIServiceRegistration) *crdRegistrationController {
c := &crdRegistrationController{ c := &crdRegistrationController{
crdLister: crdinformer.Lister(), crdLister: crdinformer.Lister(),
@@ -213,8 +211,8 @@ func (c *crdRegistrationController) handleVersionUpdate(groupVersion schema.Grou
Spec: apiregistration.APIServiceSpec{ Spec: apiregistration.APIServiceSpec{
Group: groupVersion.Group, Group: groupVersion.Group,
Version: groupVersion.Version, Version: groupVersion.Version,
GroupPriorityMinimum: 1000, // TPRs should have relatively low priority GroupPriorityMinimum: 1000, // CRDs should have relatively low priority
VersionPriority: 100, // TPRs should have relatively low priority VersionPriority: 100, // CRDs should have relatively low priority
}, },
}) })