Merge pull request #64174 from liggitt/correct-openapi-extensions

Automatic merge from submit-queue (batch tested with PRs 64174, 64187, 64216, 63265, 64223). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Correctly identify types served in the kube-apiserver openapi doc

Fixes https://github.com/kubernetes/kubernetes/issues/52741

Split out from https://github.com/kubernetes/kubernetes/pull/63893

```release-note
The kube-apiserver openapi doc now includes extensions identifying APIService and CustomResourceDefinition kinds
```

hack/make-rules/test-cmd-util.sh

@@ -1453,6 +1453,7 @@ run_kubectl_old_print_tests() {
   "spec": {
     "group": "company.com",
     "version": "v1",
+    "scope": "Namespaced",
     "names": {
       "plural": "foos",
       "kind": "Foo"
@@ -1712,6 +1713,7 @@ run_crd_tests() {
   "spec": {
     "group": "company.com",
     "version": "v1",
+    "scope": "Namespaced",
     "names": {
       "plural": "foos",
       "kind": "Foo"
@@ -1733,6 +1735,7 @@ __EOF__
   "spec": {
     "group": "company.com",
     "version": "v1",
+    "scope": "Namespaced",
     "names": {
       "plural": "bars",
       "kind": "Bar"