diff --git a/pkg/apis/abac/v1beta1/doc.go b/pkg/apis/abac/v1beta1/doc.go
index 07647ddc357..f114c84f1c0 100644
--- a/pkg/apis/abac/v1beta1/doc.go
+++ b/pkg/apis/abac/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/abac
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=pkg.apis.abac.v1beta1
 
 // +groupName=abac.authorization.kubernetes.io
 
diff --git a/staging/src/k8s.io/api/admission/v1/doc.go b/staging/src/k8s.io/api/admission/v1/doc.go
index cab6528214d..c8be5b2352c 100644
--- a/staging/src/k8s.io/api/admission/v1/doc.go
+++ b/staging/src/k8s.io/api/admission/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=false
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.admission.v1
+
 // +groupName=admission.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/admission/v1beta1/doc.go b/staging/src/k8s.io/api/admission/v1beta1/doc.go
index 447495684e7..db856da122c 100644
--- a/staging/src/k8s.io/api/admission/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/admission/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=false
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.admission.v1beta1
 
 // +groupName=admission.k8s.io
 
diff --git a/staging/src/k8s.io/api/admissionregistration/v1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1/doc.go
index ec0ebb9c49c..0bcaeaa5464 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.admissionregistration.v1
+
 // +groupName=admissionregistration.k8s.io
 
 // Package v1 is the v1 version of the API.
diff --git a/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
index 344af9ae09f..8cac29df647 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1alpha1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.admissionregistration.v1alpha1
+
 // +groupName=admissionregistration.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the API.
diff --git a/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go b/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
index 40d8315738e..016a81fa85e 100644
--- a/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1beta1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.admissionregistration.v1beta1
+
 // +groupName=admissionregistration.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
diff --git a/staging/src/k8s.io/api/apidiscovery/v2/doc.go b/staging/src/k8s.io/api/apidiscovery/v2/doc.go
index f46d33e942f..9d30b342a78 100644
--- a/staging/src/k8s.io/api/apidiscovery/v2/doc.go
+++ b/staging/src/k8s.io/api/apidiscovery/v2/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.apidiscovery.v2
+
 // +groupName=apidiscovery.k8s.io
 
 package v2
diff --git a/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go b/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go
index d4fceab68d4..244986bb419 100644
--- a/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go
+++ b/staging/src/k8s.io/api/apidiscovery/v2beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.apidiscovery.v2beta1
 
 // +groupName=apidiscovery.k8s.io
 
diff --git a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go
index 867d7416514..7a2253c8536 100644
--- a/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/apiserverinternal/v1alpha1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.api.apiserverinternal.v1alpha1
 
 // +groupName=internal.apiserver.k8s.io
 
diff --git a/staging/src/k8s.io/api/apps/v1/doc.go b/staging/src/k8s.io/api/apps/v1/doc.go
index 51fe12c53de..122ae8eeb1e 100644
--- a/staging/src/k8s.io/api/apps/v1/doc.go
+++ b/staging/src/k8s.io/api/apps/v1/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.apps.v1
 
 package v1
diff --git a/staging/src/k8s.io/api/apps/v1beta1/doc.go b/staging/src/k8s.io/api/apps/v1beta1/doc.go
index 7770fab5d21..85f6df3fde9 100644
--- a/staging/src/k8s.io/api/apps/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/apps/v1beta1/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.apps.v1beta1
 
 package v1beta1
diff --git a/staging/src/k8s.io/api/apps/v1beta2/doc.go b/staging/src/k8s.io/api/apps/v1beta2/doc.go
index 7d28fe42df5..3259a47ba2e 100644
--- a/staging/src/k8s.io/api/apps/v1beta2/doc.go
+++ b/staging/src/k8s.io/api/apps/v1beta2/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.apps.v1beta2
 
 package v1beta2
diff --git a/staging/src/k8s.io/api/authentication/v1/doc.go b/staging/src/k8s.io/api/authentication/v1/doc.go
index dc3aed4e4fe..bf0cd705585 100644
--- a/staging/src/k8s.io/api/authentication/v1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=authentication.k8s.io
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.authentication.v1
 
 package v1
diff --git a/staging/src/k8s.io/api/authentication/v1alpha1/doc.go b/staging/src/k8s.io/api/authentication/v1alpha1/doc.go
index c199ccd4999..47f61e0b696 100644
--- a/staging/src/k8s.io/api/authentication/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1alpha1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=authentication.k8s.io
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.authentication.v1alpha1
 
 package v1alpha1
diff --git a/staging/src/k8s.io/api/authentication/v1beta1/doc.go b/staging/src/k8s.io/api/authentication/v1beta1/doc.go
index af63dc845bc..2acdbd02e8b 100644
--- a/staging/src/k8s.io/api/authentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/authentication/v1beta1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=authentication.k8s.io
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.authentication.v1beta1
 
 package v1beta1
diff --git a/staging/src/k8s.io/api/authorization/v1/doc.go b/staging/src/k8s.io/api/authorization/v1/doc.go
index 40bf8006e06..0a0cbf91bec 100644
--- a/staging/src/k8s.io/api/authorization/v1/doc.go
+++ b/staging/src/k8s.io/api/authorization/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.authorization.v1
+
 // +groupName=authorization.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/authorization/v1beta1/doc.go b/staging/src/k8s.io/api/authorization/v1beta1/doc.go
index 9f7332d493c..8937d1c157a 100644
--- a/staging/src/k8s.io/api/authorization/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/authorization/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.authorization.v1beta1
 
 // +groupName=authorization.k8s.io
 
diff --git a/staging/src/k8s.io/api/autoscaling/v1/doc.go b/staging/src/k8s.io/api/autoscaling/v1/doc.go
index 4ee085e165c..9f502a66091 100644
--- a/staging/src/k8s.io/api/autoscaling/v1/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v1/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.autoscaling.v1
 
 package v1
diff --git a/staging/src/k8s.io/api/autoscaling/v2/doc.go b/staging/src/k8s.io/api/autoscaling/v2/doc.go
index 8dea6339dfb..e9a98ae0099 100644
--- a/staging/src/k8s.io/api/autoscaling/v2/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v2/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.autoscaling.v2
 
 package v2
diff --git a/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go b/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
index eac92e86e80..58cc1f89dc7 100644
--- a/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.autoscaling.v2beta1
 
 package v2beta1
diff --git a/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go b/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go
index 1500372978d..5ea9edb68ad 100644
--- a/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go
+++ b/staging/src/k8s.io/api/autoscaling/v2beta2/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.autoscaling.v2beta2
 
 package v2beta2
diff --git a/staging/src/k8s.io/api/batch/v1/doc.go b/staging/src/k8s.io/api/batch/v1/doc.go
index 69088e2c5b8..1525ce2aaf4 100644
--- a/staging/src/k8s.io/api/batch/v1/doc.go
+++ b/staging/src/k8s.io/api/batch/v1/doc.go
@@ -18,4 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.batch.v1
+
 package v1
diff --git a/staging/src/k8s.io/api/batch/v1beta1/doc.go b/staging/src/k8s.io/api/batch/v1beta1/doc.go
index 3430d6939d4..b71088480ab 100644
--- a/staging/src/k8s.io/api/batch/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/batch/v1beta1/doc.go
@@ -18,5 +18,6 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.batch.v1beta1
 
 package v1beta1
diff --git a/staging/src/k8s.io/api/certificates/v1/doc.go b/staging/src/k8s.io/api/certificates/v1/doc.go
index 6c16fc29b87..3ed26758fba 100644
--- a/staging/src/k8s.io/api/certificates/v1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.certificates.v1
+
 // +groupName=certificates.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/certificates/v1alpha1/doc.go b/staging/src/k8s.io/api/certificates/v1alpha1/doc.go
index 01481df8e50..b8b1b1a696a 100644
--- a/staging/src/k8s.io/api/certificates/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1alpha1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.certificates.v1alpha1
 
 // +groupName=certificates.k8s.io
 
diff --git a/staging/src/k8s.io/api/certificates/v1beta1/doc.go b/staging/src/k8s.io/api/certificates/v1beta1/doc.go
index 81608a554c4..dddb7cb97fc 100644
--- a/staging/src/k8s.io/api/certificates/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/certificates/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.certificates.v1beta1
 
 // +groupName=certificates.k8s.io
 
diff --git a/staging/src/k8s.io/api/coordination/v1/doc.go b/staging/src/k8s.io/api/coordination/v1/doc.go
index 82ae6340c7d..fc427222c13 100644
--- a/staging/src/k8s.io/api/coordination/v1/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.coordination.v1
 
 // +groupName=coordination.k8s.io
 
diff --git a/staging/src/k8s.io/api/coordination/v1alpha2/doc.go b/staging/src/k8s.io/api/coordination/v1alpha2/doc.go
index dff7df47fc4..134b182aedc 100644
--- a/staging/src/k8s.io/api/coordination/v1alpha2/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1alpha2/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.coordination.v1alpha2
 
 // +groupName=coordination.k8s.io
 
diff --git a/staging/src/k8s.io/api/coordination/v1beta1/doc.go b/staging/src/k8s.io/api/coordination/v1beta1/doc.go
index cab8becf677..22c5a917628 100644
--- a/staging/src/k8s.io/api/coordination/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/coordination/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.coordination.v1beta1
 
 // +groupName=coordination.k8s.io
 
diff --git a/staging/src/k8s.io/api/core/v1/doc.go b/staging/src/k8s.io/api/core/v1/doc.go
index e4e9196aebc..a41f2ce1f6c 100644
--- a/staging/src/k8s.io/api/core/v1/doc.go
+++ b/staging/src/k8s.io/api/core/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.core.v1
+
 // +groupName=
 
 // Package v1 is the v1 version of the core API.
diff --git a/staging/src/k8s.io/api/discovery/v1/doc.go b/staging/src/k8s.io/api/discovery/v1/doc.go
index 43e30b7f432..2f4d40a4e23 100644
--- a/staging/src/k8s.io/api/discovery/v1/doc.go
+++ b/staging/src/k8s.io/api/discovery/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.discovery.v1
+
 // +groupName=discovery.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/discovery/v1beta1/doc.go b/staging/src/k8s.io/api/discovery/v1beta1/doc.go
index f12087eff1b..aa5ba744287 100644
--- a/staging/src/k8s.io/api/discovery/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/discovery/v1beta1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.discovery.v1beta1
+
 // +groupName=discovery.k8s.io
 
 package v1beta1
diff --git a/staging/src/k8s.io/api/events/v1/doc.go b/staging/src/k8s.io/api/events/v1/doc.go
index 911639044f8..49e9733f468 100644
--- a/staging/src/k8s.io/api/events/v1/doc.go
+++ b/staging/src/k8s.io/api/events/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.events.v1
+
 // +groupName=events.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/events/v1beta1/doc.go b/staging/src/k8s.io/api/events/v1beta1/doc.go
index e4864294fd2..24023038554 100644
--- a/staging/src/k8s.io/api/events/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/events/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.events.v1beta1
 
 // +groupName=events.k8s.io
 
diff --git a/staging/src/k8s.io/api/extensions/v1beta1/doc.go b/staging/src/k8s.io/api/extensions/v1beta1/doc.go
index be710973cb9..bf39ca3e1e7 100644
--- a/staging/src/k8s.io/api/extensions/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/extensions/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.extensions.v1beta1
 // +k8s:validation-gen=TypeMeta
 // +k8s:validation-gen-input=k8s.io/api/extensions/v1beta1
 
diff --git a/staging/src/k8s.io/api/flowcontrol/v1/doc.go b/staging/src/k8s.io/api/flowcontrol/v1/doc.go
index ad5f4579191..b1367b92516 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.flowcontrol.v1
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
diff --git a/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go b/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go
index 20268c1f2da..e66df16d6a0 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.flowcontrol.v1beta1
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
diff --git a/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go b/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go
index 2dcad11ad9a..fb00b5857b3 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1beta2/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.flowcontrol.v1beta2
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
diff --git a/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go b/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go
index 95f4430d383..ad57ab2bc8b 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1beta3/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.flowcontrol.v1beta3
 
 // +groupName=flowcontrol.apiserver.k8s.io
 
diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go b/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
index f5fbbdbf0c3..7e7a980c6c8 100644
--- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.api.imagepolicy.v1alpha1
 
 // +groupName=imagepolicy.k8s.io
 
diff --git a/staging/src/k8s.io/api/networking/v1/doc.go b/staging/src/k8s.io/api/networking/v1/doc.go
index e2093b7df67..42da00e2480 100644
--- a/staging/src/k8s.io/api/networking/v1/doc.go
+++ b/staging/src/k8s.io/api/networking/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.networking.v1
+
 // +groupName=networking.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/networking/v1beta1/doc.go b/staging/src/k8s.io/api/networking/v1beta1/doc.go
index c5a03e04e8a..6ec15316621 100644
--- a/staging/src/k8s.io/api/networking/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/networking/v1beta1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.networking.v1beta1
+
 // +groupName=networking.k8s.io
 
 package v1beta1
diff --git a/staging/src/k8s.io/api/node/v1/doc.go b/staging/src/k8s.io/api/node/v1/doc.go
index 3239af70399..3f8bfbc0142 100644
--- a/staging/src/k8s.io/api/node/v1/doc.go
+++ b/staging/src/k8s.io/api/node/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.node.v1
+
 // +groupName=node.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/node/v1alpha1/doc.go b/staging/src/k8s.io/api/node/v1alpha1/doc.go
index 2f3d46ac205..97745728765 100644
--- a/staging/src/k8s.io/api/node/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/node/v1alpha1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.api.node.v1alpha1
 
 // +groupName=node.k8s.io
 
diff --git a/staging/src/k8s.io/api/node/v1beta1/doc.go b/staging/src/k8s.io/api/node/v1beta1/doc.go
index 7b47c8df666..2cf0f4a124e 100644
--- a/staging/src/k8s.io/api/node/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/node/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.node.v1beta1
 
 // +groupName=node.k8s.io
 
diff --git a/staging/src/k8s.io/api/policy/v1/doc.go b/staging/src/k8s.io/api/policy/v1/doc.go
index ff47e7fd492..9b5314bc0bd 100644
--- a/staging/src/k8s.io/api/policy/v1/doc.go
+++ b/staging/src/k8s.io/api/policy/v1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.policy.v1
 
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget,
diff --git a/staging/src/k8s.io/api/policy/v1beta1/doc.go b/staging/src/k8s.io/api/policy/v1beta1/doc.go
index 777106c6002..3888e9216f8 100644
--- a/staging/src/k8s.io/api/policy/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/policy/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.policy.v1beta1
 
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget,
diff --git a/staging/src/k8s.io/api/rbac/v1/doc.go b/staging/src/k8s.io/api/rbac/v1/doc.go
index 408546274b0..f120f5d3a23 100644
--- a/staging/src/k8s.io/api/rbac/v1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.rbac.v1
+
 // +groupName=rbac.authorization.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/rbac/v1alpha1/doc.go b/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
index 70d3c0e9718..079b791b15e 100644
--- a/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1alpha1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.api.rbac.v1alpha1
 
 // +groupName=rbac.authorization.k8s.io
 
diff --git a/staging/src/k8s.io/api/rbac/v1beta1/doc.go b/staging/src/k8s.io/api/rbac/v1beta1/doc.go
index 504a58d8bfa..b1890610fa7 100644
--- a/staging/src/k8s.io/api/rbac/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/rbac/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.rbac.v1beta1
 
 // +groupName=rbac.authorization.k8s.io
 
diff --git a/staging/src/k8s.io/api/resource/v1/doc.go b/staging/src/k8s.io/api/resource/v1/doc.go
index c94ca75ddc3..645c1cb53f4 100644
--- a/staging/src/k8s.io/api/resource/v1/doc.go
+++ b/staging/src/k8s.io/api/resource/v1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.resource.v1
 // +groupName=resource.k8s.io
 
 // Package v1 is the v1 version of the resource API.
diff --git a/staging/src/k8s.io/api/resource/v1alpha3/doc.go b/staging/src/k8s.io/api/resource/v1alpha3/doc.go
index 82e64f1d00c..b6bfd79c369 100644
--- a/staging/src/k8s.io/api/resource/v1alpha3/doc.go
+++ b/staging/src/k8s.io/api/resource/v1alpha3/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.resource.v1alpha3
+
 // +groupName=resource.k8s.io
 
 // Package v1alpha3 is the v1alpha3 version of the resource API.
diff --git a/staging/src/k8s.io/api/resource/v1beta1/doc.go b/staging/src/k8s.io/api/resource/v1beta1/doc.go
index 1e08b69a175..290c7bacff9 100644
--- a/staging/src/k8s.io/api/resource/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/resource/v1beta1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.resource.v1beta1
+
 // +groupName=resource.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the resource API.
diff --git a/staging/src/k8s.io/api/resource/v1beta2/doc.go b/staging/src/k8s.io/api/resource/v1beta2/doc.go
index 365113ae4e1..4570270a27b 100644
--- a/staging/src/k8s.io/api/resource/v1beta2/doc.go
+++ b/staging/src/k8s.io/api/resource/v1beta2/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.resource.v1beta2
+
 // +groupName=resource.k8s.io
 
 // Package v1beta2 is the v1beta2 version of the resource API.
diff --git a/staging/src/k8s.io/api/scheduling/v1/doc.go b/staging/src/k8s.io/api/scheduling/v1/doc.go
index c587bee9ea5..8fee2e90bb6 100644
--- a/staging/src/k8s.io/api/scheduling/v1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.scheduling.v1
+
 // +groupName=scheduling.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go b/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
index 476ab6f66c1..2b6182e8648 100644
--- a/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1alpha1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.api.scheduling.v1alpha1
 
 // +groupName=scheduling.k8s.io
 
diff --git a/staging/src/k8s.io/api/scheduling/v1beta1/doc.go b/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
index 1bc36106116..ef4bd57d5d1 100644
--- a/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/scheduling/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.scheduling.v1beta1
 
 // +groupName=scheduling.k8s.io
 
diff --git a/staging/src/k8s.io/api/storage/v1/doc.go b/staging/src/k8s.io/api/storage/v1/doc.go
index 162a99522e5..d344f997e0e 100644
--- a/staging/src/k8s.io/api/storage/v1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=storage.k8s.io
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.storage.v1
 
 package v1
diff --git a/staging/src/k8s.io/api/storage/v1alpha1/doc.go b/staging/src/k8s.io/api/storage/v1alpha1/doc.go
index 90af522ade3..18f9c9c3a2f 100644
--- a/staging/src/k8s.io/api/storage/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1alpha1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=storage.k8s.io
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.storage.v1alpha1
 
 package v1alpha1
diff --git a/staging/src/k8s.io/api/storage/v1beta1/doc.go b/staging/src/k8s.io/api/storage/v1beta1/doc.go
index 174482b6092..f0eac351950 100644
--- a/staging/src/k8s.io/api/storage/v1beta1/doc.go
+++ b/staging/src/k8s.io/api/storage/v1beta1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=storage.k8s.io
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.storage.v1beta1
 
 package v1beta1
diff --git a/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go b/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go
index df8f3a65d45..4a1723d12a4 100644
--- a/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go
+++ b/staging/src/k8s.io/api/storagemigration/v1alpha1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.api.storagemigration.v1alpha1
+
 // +groupName=storagemigration.k8s.io
 
 package v1alpha1
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go
index 39e70bb035a..ed2a855d1ae 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/doc.go
@@ -20,6 +20,8 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1
+
 // +groupName=apiextensions.k8s.io
 
 // Package v1 is the v1 version of the API.
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
index 6ddea3e0140..ccf0a36a4a8 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go
@@ -20,6 +20,8 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:openapi-gen=true
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1
+
 // +groupName=apiextensions.k8s.io
 
 // Package v1beta1 is the v1beta1 version of the API.
diff --git a/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go b/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
index d0aada9dd75..f3cd6006049 100644
--- a/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
+++ b/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
@@ -99,6 +99,7 @@ import (
 // +protobuf.options.(gogoproto.goproto_stringer)=false
 // +k8s:deepcopy-gen=true
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.api.resource
 type Quantity struct {
 	// i is the quantity in int64 scaled form, if d.Dec == nil
 	i int64Amount
@@ -858,6 +859,7 @@ func (q *Quantity) SetScaled(value int64, scale Scale) {
 // +protobuf.options.marshal=false
 // +protobuf.options.(gogoproto.goproto_stringer)=false
 // +k8s:deepcopy-gen=true
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.api.resource
 type QuantityValue struct {
 	Quantity
 }
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
index 617b9a5d30f..31c87361f63 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.apis.meta.v1
 
 // +groupName=meta.k8s.io
 
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
index 46b0e133c37..159ca0573fb 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/doc.go
@@ -17,6 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.apis.meta.v1beta1
 
 // +groupName=meta.k8s.io
 
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
index c76c2b994d1..35bdf7c7cfd 100644
--- a/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/doc.go
@@ -19,6 +19,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/apimachinery/pkg/apis/testapigroup
 // +k8s:openapi-gen=false
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.apis.testapigroup.v1
 
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=testapigroup.apimachinery.k8s.io
diff --git a/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go b/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go
index b54429bd89c..fd012dbc797 100644
--- a/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/runtime/doc.go
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.runtime
+
 // Package runtime includes helper functions for working with API objects
 // that follow the kubernetes API object conventions, which are:
 //
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go b/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
index 5fd2e16c842..f372ae589c0 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
@@ -38,6 +38,7 @@ import (
 // +protobuf=true
 // +protobuf.options.(gogoproto.goproto_stringer)=false
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.util.intstr
 type IntOrString struct {
 	Type   Type   `protobuf:"varint,1,opt,name=type,casttype=Type"`
 	IntVal int32  `protobuf:"varint,2,opt,name=intVal"`
diff --git a/staging/src/k8s.io/apimachinery/pkg/version/doc.go b/staging/src/k8s.io/apimachinery/pkg/version/doc.go
index 5f446a4f4af..70e3f76b23e 100644
--- a/staging/src/k8s.io/apimachinery/pkg/version/doc.go
+++ b/staging/src/k8s.io/apimachinery/pkg/version/doc.go
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.apimachinery.pkg.version
+//
 
 // Package version supplies the type for version information.
 package version
diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
index 6c719b84729..7e4e08af124 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1/doc.go
@@ -19,6 +19,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/audit
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.apiserver.pkg.apis.audit.v1
 
 // +groupName=audit.k8s.io
 
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go
index e378b75cf69..0925da4243d 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/client-go/pkg/apis/clientauthentication
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.client-go.pkg.apis.clientauthentication.v1
 
 // +groupName=client.authentication.k8s.io
 
diff --git a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
index 6eb6a981574..207ff5c9d13 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/clientauthentication/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/client-go/pkg/apis/clientauthentication
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.client-go.pkg.apis.clientauthentication.v1beta1
 
 // +groupName=client.authentication.k8s.io
 
diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
index 4bce737d5ed..487bed6d0ab 100644
--- a/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/cloud-provider/config/v1alpha1/doc.go
@@ -27,6 +27,8 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/controller-manager/config/v1alpha1
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.cloud-provider.config.v1alpha1
+
 // +groupName=cloudcontrollermanager.config.k8s.io
 
 package v1alpha1
diff --git a/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go
index 05c1119a21b..24df66baeba 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/node/config/v1alpha1/doc.go
@@ -17,5 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/node/config
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/node/config/v1alpha1
+// +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.cloud-provider.controllers.node.config.v1alpha1
 
 package v1alpha1
diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
index 7b9a0935177..84ee720d840 100644
--- a/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/cloud-provider/controllers/service/config/v1alpha1/doc.go
@@ -17,5 +17,7 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config
 // +k8s:conversion-gen=k8s.io/cloud-provider/controllers/service/config/v1alpha1
+// +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.cloud-provider.controllers.service.config.v1alpha1
 
 package v1alpha1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go
index d59731bcf1c..985e8d019a9 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/core/v1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/core
 // +groupName=
+// +k8s:openapi-model-package=io.k8s.code-generator.examples.apiserver.apis.core.v1
 
 package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go
index 9e4436f5c46..0d1407e0b62 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example/v1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/example
 // +groupName=example.apiserver.code-generator.k8s.io
+// +k8s:openapi-model-package=io.k8s.code-generator.examples.apiserver.apis.example.v1
 
 package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go
index 42353ffd045..e1d68f6cb44 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example2/v1/doc.go
@@ -20,5 +20,6 @@ limitations under the License.
 // +groupName=example.test.apiserver.code-generator.k8s.io
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/example2
 // +groupGoName=SecondExample
+// +k8s:openapi-model-package=io.k8s.code-generator.examples.apiserver.apis.example2.v1
 
 package v1
diff --git a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go
index cd598d47ad1..5756ae11ceb 100644
--- a/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go
+++ b/staging/src/k8s.io/code-generator/examples/apiserver/apis/example3.io/v1/doc.go
@@ -20,5 +20,6 @@ limitations under the License.
 // +groupName=example.dots.apiserver.code-generator.k8s.io
 // +k8s:conversion-gen=k8s.io/code-generator/examples/apiserver/apis/example3.io
 // +groupGoName=ThirdExample
+// +k8s:openapi-model-package=io.k8s.code-generator.examples.apiserver.apis.example3.io.v1
 
 package v1
diff --git a/staging/src/k8s.io/component-base/config/v1alpha1/doc.go b/staging/src/k8s.io/component-base/config/v1alpha1/doc.go
index 7e4d6e8904e..d1ef3491d6c 100644
--- a/staging/src/k8s.io/component-base/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/component-base/config/v1alpha1/doc.go
@@ -16,5 +16,7 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/component-base/config
+// +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.component-base.config.v1alpha1
 
 package v1alpha1
diff --git a/staging/src/k8s.io/component-base/logs/api/v1/doc.go b/staging/src/k8s.io/component-base/logs/api/v1/doc.go
index dee5335fa8e..fe5367f997a 100644
--- a/staging/src/k8s.io/component-base/logs/api/v1/doc.go
+++ b/staging/src/k8s.io/component-base/logs/api/v1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:openapi-model-package=io.k8s.component-base.logs.api.v1
 
 // Package v1 contains the configuration API for logging.
 //
diff --git a/staging/src/k8s.io/component-base/tracing/api/v1/doc.go b/staging/src/k8s.io/component-base/tracing/api/v1/doc.go
index 48e6e20f3f0..29f9451d9e7 100644
--- a/staging/src/k8s.io/component-base/tracing/api/v1/doc.go
+++ b/staging/src/k8s.io/component-base/tracing/api/v1/doc.go
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.component-base.tracing.api.v1
 
 // Package v1 contains the configuration API for tracing.
 //
diff --git a/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go b/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go
index 72d1f3cf6b0..79a719d6b6c 100644
--- a/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/controller-manager/config/v1alpha1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/controller-manager/config
 // +k8s:conversion-gen=k8s.io/controller-manager/config/v1alpha1
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.controller-manager.config.v1alpha1
+
 // +groupName=controllermanager.config.k8s.io
 
 package v1alpha1
diff --git a/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go b/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go
index 0af8864a881..a9e76bc0908 100644
--- a/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go
+++ b/staging/src/k8s.io/controller-manager/config/v1beta1/doc.go
@@ -17,6 +17,8 @@ limitations under the License.
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=k8s.io/controller-manager/config
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.controller-manager.config.v1beta1
+
 // +groupName=controllermanager.config.k8s.io
 
 package v1beta1
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
index d3dfe0689e0..95e92cb8df0 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go
@@ -18,9 +18,11 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/kube-aggregator/pkg/apis/apiregistration
 // +k8s:openapi-gen=true
-// +groupName=apiregistration.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.kube-aggregator.pkg.apis.apiregistration.v1
+
+// +groupName=apiregistration.k8s.io
 
 // Package v1 contains the API Registration API, which is responsible for
 // registering an API `Group`/`Version` with another kubernetes like API server.
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
index 40d1131ca08..07ee950de8f 100644
--- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
+++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go
@@ -18,9 +18,11 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/kube-aggregator/pkg/apis/apiregistration
 // +k8s:openapi-gen=true
-// +groupName=apiregistration.k8s.io
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:prerelease-lifecycle-gen=true
+// +k8s:openapi-model-package=io.k8s.kube-aggregator.pkg.apis.apiregistration.v1beta1
+
+// +groupName=apiregistration.k8s.io
 
 // Package v1beta1 contains the API Registration API, which is responsible for
 // registering an API `Group`/`Version` with another kubernetes like API server.
diff --git a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
index 9017efebb1a..e3d2069cfe5 100644
--- a/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kube-controller-manager/config/v1alpha1/doc.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kube-controller-manager.config.v1alpha1
+
 // +groupName=kubecontrollermanager.config.k8s.io
 
 package v1alpha1
diff --git a/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go b/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go
index 5937b74cf0e..be101fa91fd 100644
--- a/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kube-proxy/config/v1alpha1/doc.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kube-proxy.config.v1alpha1
+
 // +groupName=kubeproxy.config.k8s.io
 
 package v1alpha1
diff --git a/staging/src/k8s.io/kube-scheduler/config/v1/doc.go b/staging/src/k8s.io/kube-scheduler/config/v1/doc.go
index 2d0e79e132f..08f9a7ecd71 100644
--- a/staging/src/k8s.io/kube-scheduler/config/v1/doc.go
+++ b/staging/src/k8s.io/kube-scheduler/config/v1/doc.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kube-scheduler.config.v1
+
 // +groupName=kubescheduler.config.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/doc.go b/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/doc.go
index d53157c3152..5a05184737b 100644
--- a/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/doc.go
@@ -19,5 +19,6 @@ limitations under the License.
 // +groupName=kubectl.config.k8s.io
 // +k8s:conversion-gen=k8s.io/kubectl/pkg/config
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-model-package=io.k8s.kubectl.pkg.config.v1alpha1
 
 package v1alpha1 // Package v1alpha1 import "k8s.io/kubectl/pkg/config/v1alpha1"
diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1beta1/doc.go b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/doc.go
index 4d08d8dcb67..1efcf0820ae 100644
--- a/staging/src/k8s.io/kubectl/pkg/config/v1beta1/doc.go
+++ b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/doc.go
@@ -16,6 +16,7 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kubectl.pkg.config.v1beta1
 // +groupName=kubectl.config.k8s.io
 // +k8s:conversion-gen=k8s.io/kubectl/pkg/config
 // +k8s:defaulter-gen=TypeMeta
diff --git a/staging/src/k8s.io/kubelet/config/v1/doc.go b/staging/src/k8s.io/kubelet/config/v1/doc.go
index 2c2ec7aa3d3..2b8cbe19fe4 100644
--- a/staging/src/k8s.io/kubelet/config/v1/doc.go
+++ b/staging/src/k8s.io/kubelet/config/v1/doc.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kubelet.config.v1
+
 // +groupName=kubelet.config.k8s.io
 
 package v1
diff --git a/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go b/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go
index 165efbb23c6..bac345bbb2d 100644
--- a/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go
+++ b/staging/src/k8s.io/kubelet/config/v1alpha1/doc.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kubelet.config.v1alpha1
+
 // +groupName=kubelet.config.k8s.io
 
 package v1alpha1
diff --git a/staging/src/k8s.io/kubelet/config/v1beta1/doc.go b/staging/src/k8s.io/kubelet/config/v1beta1/doc.go
index 0edffa4b691..e687711a605 100644
--- a/staging/src/k8s.io/kubelet/config/v1beta1/doc.go
+++ b/staging/src/k8s.io/kubelet/config/v1beta1/doc.go
@@ -16,6 +16,8 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.kubelet.config.v1beta1
+
 // +groupName=kubelet.config.k8s.io
 
 package v1beta1
diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go
index b42d1c7dfba..0e9d313f754 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/custom_metrics
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.metrics.pkg.apis.custom_metrics.v1beta1
 
 // Package v1beta1 is the v1beta1 version of the custom_metrics API.
 package v1beta1
diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go
index d7c6d3a9a9a..2dbe251bc18 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/custom_metrics
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.metrics.pkg.apis.custom_metrics.v1beta2
 
 // Package v1beta2 is the v1beta2 version of the custom_metrics API.
 package v1beta2
diff --git a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go
index 7e1d6e0abab..f875c9a2622 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/external_metrics/v1beta1/doc.go
@@ -18,6 +18,7 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/external_metrics
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.metrics.pkg.apis.external_metrics.v1beta1
 
 // Package v1beta1 is the v1beta1 version of the external metrics API.
 package v1beta1
diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go
index 6c84d42a205..88409c831c2 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/doc.go
@@ -18,6 +18,8 @@ limitations under the License.
 // +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=io.k8s.metrics.pkg.apis.metrics.v1alpha1
+
 // +groupName=metrics.k8s.io
 
 // Package v1alpha1 is the v1alpha1 version of the metrics API.
diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go
index 760a9afbadf..324b0d0f843 100644
--- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go
+++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1/doc.go
@@ -19,6 +19,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/metrics/pkg/apis/metrics
 // +k8s:openapi-gen=true
 // +groupName=metrics.k8s.io
+// +k8s:openapi-model-package=io.k8s.metrics.pkg.apis.metrics.v1beta1
 
 // Package v1beta1 is the v1beta1 version of the metrics API.
 package v1beta1
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
index 17625ba062d..13d56078744 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
@@ -20,6 +20,7 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:prerelease-lifecycle-gen=true
 // +groupName=wardle.example.com
+// +k8s:openapi-model-package=io.k8s.sample-apiserver.pkg.apis.wardle.v1alpha1
 
 // Package v1alpha1 is the v1alpha1 version of the API.
 package v1alpha1
diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
index 2b7c615aee9..747050070c2 100644
--- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
+++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1beta1/doc.go
@@ -19,6 +19,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/sample-apiserver/pkg/apis/wardle
 // +k8s:defaulter-gen=TypeMeta
 // +groupName=wardle.example.com
+// +k8s:openapi-model-package=io.k8s.sample-apiserver.pkg.apis.wardle.v1beta1
 
 // Package v1beta1 is the v1beta1 version of the API.
 package v1beta1