Merge pull request #53152 from mbohlool/release-1.7

Automatic merge from submit-queue.

Manually cherry-pick 4379bbd as it is part of a larger PR

The commit 4379bbd fixes a bug in openapi spec that resulted in some of the type missing group-version-kind extension. That is specificly serious for the projects that vendor kubernetes in (like minikube). It results in them not having GVKs at all (kubernetes/minikube#1996).

```release-note
Bugfix: OpenAPI models may not get group-version-kind extension if kubernetes is vendored in another project (e.g. minikube). Kubectl 1.8 needs this extension to work with those projects.
```
@wojtek-t

Kubernetes-commit: c33e2b9d5e7df8464a7464496526ee272ad44ff4