diff --git a/Makefile b/Makefile
index 44fd3a6e09b..4e7716442c6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,6 @@ GO_BUILD_PACKAGES_EXPANDED :=$(GO_BUILD_PACKAGES)
 # LDFLAGS are not needed for dummy builds (saving time on calling git commands)
 GO_LD_FLAGS:=
 
-# Set crd-schema-gen variables
-CONTROLLER_GEN_VERSION :=v0.2.1
-
 # $1 - target name
 # $2 - apis
 # $3 - manifests
diff --git a/apps/v1/generated.proto b/apps/v1/generated.proto
index 21d2202e04a..b412aad7653 100644
--- a/apps/v1/generated.proto
+++ b/apps/v1/generated.proto
@@ -73,7 +73,6 @@ message DeploymentCondition {
 // is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment
 // is triggered by any means.
 message DeploymentConfig {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec represents a desired deployment state and how to deploy to it.
@@ -85,7 +84,6 @@ message DeploymentConfig {
 
 // DeploymentConfigList is a collection of deployment configs.
 message DeploymentConfigList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of deployment configs
diff --git a/apps/v1/types.go b/apps/v1/types.go
index f3ba06191dd..02e03984946 100644
--- a/apps/v1/types.go
+++ b/apps/v1/types.go
@@ -25,8 +25,7 @@ import (
 // is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment
 // is triggered by any means.
 type DeploymentConfig struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec represents a desired deployment state and how to deploy to it.
@@ -389,7 +388,6 @@ type DeploymentCondition struct {
 // DeploymentConfigList is a collection of deployment configs.
 type DeploymentConfigList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of deployment configs
diff --git a/apps/v1/zz_generated.swagger_doc_generated.go b/apps/v1/zz_generated.swagger_doc_generated.go
index f8ec2bd1dd7..9e3a07e8f96 100644
--- a/apps/v1/zz_generated.swagger_doc_generated.go
+++ b/apps/v1/zz_generated.swagger_doc_generated.go
@@ -56,10 +56,9 @@ func (DeploymentCondition) SwaggerDoc() map[string]string {
 }
 
 var map_DeploymentConfig = map[string]string{
-	"":         "Deployment Configs define the template for a pod and manages deploying new images or configuration changes. A single deployment configuration is usually analogous to a single micro-service. Can support many different deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec represents a desired deployment state and how to deploy to it.",
-	"status":   "Status represents the current deployment state.",
+	"":       "Deployment Configs define the template for a pod and manages deploying new images or configuration changes. A single deployment configuration is usually analogous to a single micro-service. Can support many different deployment patterns, including full restart, customizable rolling updates, and  fully custom behaviors, as well as pre- and post- deployment hooks. Each individual deployment is represented as a replication controller.\n\nA deployment is \"triggered\" when its configuration is changed or a tag in an Image Stream is changed. Triggers can be disabled to allow manual control over a deployment. The \"strategy\" determines how the deployment is carried out and may be changed at any time. The `latestVersion` field is updated when a new deployment is triggered by any means.",
+	"spec":   "Spec represents a desired deployment state and how to deploy to it.",
+	"status": "Status represents the current deployment state.",
 }
 
 func (DeploymentConfig) SwaggerDoc() map[string]string {
@@ -67,9 +66,8 @@ func (DeploymentConfig) SwaggerDoc() map[string]string {
 }
 
 var map_DeploymentConfigList = map[string]string{
-	"":         "DeploymentConfigList is a collection of deployment configs.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of deployment configs",
+	"":      "DeploymentConfigList is a collection of deployment configs.",
+	"items": "Items is a list of deployment configs",
 }
 
 func (DeploymentConfigList) SwaggerDoc() map[string]string {
diff --git a/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml b/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
index 5ec81b3bd49..028ce1db160 100644
--- a/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
+++ b/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: rolebindingrestrictions
     singular: rolebindingrestriction
   scope: Namespaced
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -34,7 +35,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: Spec defines the matcher.
diff --git a/authorization/v1/generated.proto b/authorization/v1/generated.proto
index 98168384618..d43b7371857 100644
--- a/authorization/v1/generated.proto
+++ b/authorization/v1/generated.proto
@@ -43,12 +43,12 @@ message Action {
   optional bool isNonResourceURL = 9;
 
   // Content is the actual content of the request for create and update
+  // +kubebuilder:validation:PreserveUnknownFields
   optional k8s.io.apimachinery.pkg.runtime.RawExtension content = 7;
 }
 
 // ClusterRole is a logical grouping of PolicyRules that can be referenced as a unit by ClusterRoleBindings.
 message ClusterRole {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Rules holds all the PolicyRules for this ClusterRole
@@ -64,7 +64,6 @@ message ClusterRole {
 // It adds who information via (Users and Groups) OR Subjects and namespace information by which namespace it exists in.
 // ClusterRoleBindings in a given namespace only have effect in that namespace (excepting the master namespace which has power in all namespaces).
 message ClusterRoleBinding {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // UserNames holds all the usernames directly bound to the role.
@@ -94,7 +93,6 @@ message ClusterRoleBinding {
 
 // ClusterRoleBindingList is a collection of ClusterRoleBindings
 message ClusterRoleBindingList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of ClusterRoleBindings
@@ -103,7 +101,6 @@ message ClusterRoleBindingList {
 
 // ClusterRoleList is a collection of ClusterRoles
 message ClusterRoleList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of ClusterRoles
@@ -215,6 +212,7 @@ message PolicyRule {
 
   // AttributeRestrictions will vary depending on what the Authorizer/AuthorizationAttributeBuilder pair supports.
   // If the Authorizer does not recognize how to handle the AttributeRestrictions, the Authorizer should report an error.
+  // +kubebuilder:validation:PreserveUnknownFields
   optional k8s.io.apimachinery.pkg.runtime.RawExtension attributeRestrictions = 2;
 
   // APIGroups is the name of the APIGroup that contains the resources.  If this field is empty, then both kubernetes and origin API groups are assumed.
@@ -261,7 +259,6 @@ message ResourceAccessReviewResponse {
 
 // Role is a logical grouping of PolicyRules that can be referenced as a unit by RoleBindings.
 message Role {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Rules holds all the PolicyRules for this Role
@@ -272,7 +269,6 @@ message Role {
 // It adds who information via (Users and Groups) OR Subjects and namespace information by which namespace it exists in.
 // RoleBindings in a given namespace only have effect in that namespace (excepting the master namespace which has power in all namespaces).
 message RoleBinding {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // UserNames holds all the usernames directly bound to the role.
@@ -302,7 +298,6 @@ message RoleBinding {
 
 // RoleBindingList is a collection of RoleBindings
 message RoleBindingList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of RoleBindings
@@ -315,7 +310,6 @@ message RoleBindingList {
 // belongs.  If any one of those RoleBindingRestriction objects matches
 // a subject, rolebindings on that subject in the namespace are allowed.
 message RoleBindingRestriction {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec defines the matcher.
@@ -324,7 +318,6 @@ message RoleBindingRestriction {
 
 // RoleBindingRestrictionList is a collection of RoleBindingRestriction objects.
 message RoleBindingRestrictionList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of RoleBindingRestriction objects.
@@ -349,7 +342,6 @@ message RoleBindingRestrictionSpec {
 
 // RoleList is a collection of Roles
 message RoleList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of Roles
diff --git a/authorization/v1/types.go b/authorization/v1/types.go
index fde3ecf3d7b..99623b73635 100644
--- a/authorization/v1/types.go
+++ b/authorization/v1/types.go
@@ -32,6 +32,7 @@ type PolicyRule struct {
 	Verbs []string `json:"verbs" protobuf:"bytes,1,rep,name=verbs"`
 	// AttributeRestrictions will vary depending on what the Authorizer/AuthorizationAttributeBuilder pair supports.
 	// If the Authorizer does not recognize how to handle the AttributeRestrictions, the Authorizer should report an error.
+	// +kubebuilder:validation:PreserveUnknownFields
 	AttributeRestrictions kruntime.RawExtension `json:"attributeRestrictions,omitempty" protobuf:"bytes,2,opt,name=attributeRestrictions"`
 	// APIGroups is the name of the APIGroup that contains the resources.  If this field is empty, then both kubernetes and origin API groups are assumed.
 	// That means that if an action is requested against one of the enumerated resources in either the kubernetes or the origin API group, the request
@@ -58,8 +59,7 @@ type IsPersonalSubjectAccessReview struct {
 
 // Role is a logical grouping of PolicyRules that can be referenced as a unit by RoleBindings.
 type Role struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Rules holds all the PolicyRules for this Role
@@ -82,8 +82,7 @@ func (t OptionalNames) String() string {
 // It adds who information via (Users and Groups) OR Subjects and namespace information by which namespace it exists in.
 // RoleBindings in a given namespace only have effect in that namespace (excepting the master namespace which has power in all namespaces).
 type RoleBinding struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// UserNames holds all the usernames directly bound to the role.
@@ -326,6 +325,7 @@ type Action struct {
 	// IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)
 	IsNonResourceURL bool `json:"isNonResourceURL" protobuf:"varint,9,opt,name=isNonResourceURL"`
 	// Content is the actual content of the request for create and update
+	// +kubebuilder:validation:PreserveUnknownFields
 	Content kruntime.RawExtension `json:"content,omitempty" protobuf:"bytes,7,opt,name=content"`
 }
 
@@ -334,7 +334,6 @@ type Action struct {
 // RoleBindingList is a collection of RoleBindings
 type RoleBindingList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of RoleBindings
@@ -346,7 +345,6 @@ type RoleBindingList struct {
 // RoleList is a collection of Roles
 type RoleList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of Roles
@@ -359,8 +357,7 @@ type RoleList struct {
 
 // ClusterRole is a logical grouping of PolicyRules that can be referenced as a unit by ClusterRoleBindings.
 type ClusterRole struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Rules holds all the PolicyRules for this ClusterRole
@@ -380,8 +377,7 @@ type ClusterRole struct {
 // It adds who information via (Users and Groups) OR Subjects and namespace information by which namespace it exists in.
 // ClusterRoleBindings in a given namespace only have effect in that namespace (excepting the master namespace which has power in all namespaces).
 type ClusterRoleBinding struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// UserNames holds all the usernames directly bound to the role.
@@ -428,7 +424,6 @@ type NamedClusterRoleBinding struct {
 // ClusterRoleBindingList is a collection of ClusterRoleBindings
 type ClusterRoleBindingList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of ClusterRoleBindings
@@ -440,7 +435,6 @@ type ClusterRoleBindingList struct {
 // ClusterRoleList is a collection of ClusterRoles
 type ClusterRoleList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of ClusterRoles
@@ -456,9 +450,7 @@ type ClusterRoleList struct {
 // belongs.  If any one of those RoleBindingRestriction objects matches
 // a subject, rolebindings on that subject in the namespace are allowed.
 type RoleBindingRestriction struct {
-	metav1.TypeMeta `json:",inline"`
-
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec defines the matcher.
@@ -486,8 +478,6 @@ type RoleBindingRestrictionSpec struct {
 // RoleBindingRestrictionList is a collection of RoleBindingRestriction objects.
 type RoleBindingRestrictionList struct {
 	metav1.TypeMeta `json:",inline"`
-
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of RoleBindingRestriction objects.
diff --git a/authorization/v1/zz_generated.swagger_doc_generated.go b/authorization/v1/zz_generated.swagger_doc_generated.go
index 15da0e310f0..04b3c7f446e 100644
--- a/authorization/v1/zz_generated.swagger_doc_generated.go
+++ b/authorization/v1/zz_generated.swagger_doc_generated.go
@@ -30,7 +30,6 @@ func (Action) SwaggerDoc() map[string]string {
 
 var map_ClusterRole = map[string]string{
 	"":                "ClusterRole is a logical grouping of PolicyRules that can be referenced as a unit by ClusterRoleBindings.",
-	"metadata":        "Standard object's metadata.",
 	"rules":           "Rules holds all the PolicyRules for this ClusterRole",
 	"aggregationRule": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.",
 }
@@ -41,7 +40,6 @@ func (ClusterRole) SwaggerDoc() map[string]string {
 
 var map_ClusterRoleBinding = map[string]string{
 	"":           "ClusterRoleBinding references a ClusterRole, but not contain it.  It can reference any ClusterRole in the same namespace or in the global namespace. It adds who information via (Users and Groups) OR Subjects and namespace information by which namespace it exists in. ClusterRoleBindings in a given namespace only have effect in that namespace (excepting the master namespace which has power in all namespaces).",
-	"metadata":   "Standard object's metadata.",
 	"userNames":  "UserNames holds all the usernames directly bound to the role. This field should only be specified when supporting legacy clients and servers. See Subjects for further details.",
 	"groupNames": "GroupNames holds all the groups directly bound to the role. This field should only be specified when supporting legacy clients and servers. See Subjects for further details.",
 	"subjects":   "Subjects hold object references to authorize with this rule. This field is ignored if UserNames or GroupNames are specified to support legacy clients and servers. Thus newer clients that do not need to support backwards compatibility should send only fully qualified Subjects and should omit the UserNames and GroupNames fields. Clients that need to support backwards compatibility can use this field to build the UserNames and GroupNames.",
@@ -53,9 +51,8 @@ func (ClusterRoleBinding) SwaggerDoc() map[string]string {
 }
 
 var map_ClusterRoleBindingList = map[string]string{
-	"":         "ClusterRoleBindingList is a collection of ClusterRoleBindings",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of ClusterRoleBindings",
+	"":      "ClusterRoleBindingList is a collection of ClusterRoleBindings",
+	"items": "Items is a list of ClusterRoleBindings",
 }
 
 func (ClusterRoleBindingList) SwaggerDoc() map[string]string {
@@ -63,9 +60,8 @@ func (ClusterRoleBindingList) SwaggerDoc() map[string]string {
 }
 
 var map_ClusterRoleList = map[string]string{
-	"":         "ClusterRoleList is a collection of ClusterRoles",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of ClusterRoles",
+	"":      "ClusterRoleList is a collection of ClusterRoles",
+	"items": "Items is a list of ClusterRoles",
 }
 
 func (ClusterRoleList) SwaggerDoc() map[string]string {
@@ -184,9 +180,8 @@ func (ResourceAccessReviewResponse) SwaggerDoc() map[string]string {
 }
 
 var map_Role = map[string]string{
-	"":         "Role is a logical grouping of PolicyRules that can be referenced as a unit by RoleBindings.",
-	"metadata": "Standard object's metadata.",
-	"rules":    "Rules holds all the PolicyRules for this Role",
+	"":      "Role is a logical grouping of PolicyRules that can be referenced as a unit by RoleBindings.",
+	"rules": "Rules holds all the PolicyRules for this Role",
 }
 
 func (Role) SwaggerDoc() map[string]string {
@@ -195,7 +190,6 @@ func (Role) SwaggerDoc() map[string]string {
 
 var map_RoleBinding = map[string]string{
 	"":           "RoleBinding references a Role, but not contain it.  It can reference any Role in the same namespace or in the global namespace. It adds who information via (Users and Groups) OR Subjects and namespace information by which namespace it exists in. RoleBindings in a given namespace only have effect in that namespace (excepting the master namespace which has power in all namespaces).",
-	"metadata":   "Standard object's metadata.",
 	"userNames":  "UserNames holds all the usernames directly bound to the role. This field should only be specified when supporting legacy clients and servers. See Subjects for further details.",
 	"groupNames": "GroupNames holds all the groups directly bound to the role. This field should only be specified when supporting legacy clients and servers. See Subjects for further details.",
 	"subjects":   "Subjects hold object references to authorize with this rule. This field is ignored if UserNames or GroupNames are specified to support legacy clients and servers. Thus newer clients that do not need to support backwards compatibility should send only fully qualified Subjects and should omit the UserNames and GroupNames fields. Clients that need to support backwards compatibility can use this field to build the UserNames and GroupNames.",
@@ -207,9 +201,8 @@ func (RoleBinding) SwaggerDoc() map[string]string {
 }
 
 var map_RoleBindingList = map[string]string{
-	"":         "RoleBindingList is a collection of RoleBindings",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of RoleBindings",
+	"":      "RoleBindingList is a collection of RoleBindings",
+	"items": "Items is a list of RoleBindings",
 }
 
 func (RoleBindingList) SwaggerDoc() map[string]string {
@@ -217,9 +210,8 @@ func (RoleBindingList) SwaggerDoc() map[string]string {
 }
 
 var map_RoleBindingRestriction = map[string]string{
-	"":         "RoleBindingRestriction is an object that can be matched against a subject (user, group, or service account) to determine whether rolebindings on that subject are allowed in the namespace to which the RoleBindingRestriction belongs.  If any one of those RoleBindingRestriction objects matches a subject, rolebindings on that subject in the namespace are allowed.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec defines the matcher.",
+	"":     "RoleBindingRestriction is an object that can be matched against a subject (user, group, or service account) to determine whether rolebindings on that subject are allowed in the namespace to which the RoleBindingRestriction belongs.  If any one of those RoleBindingRestriction objects matches a subject, rolebindings on that subject in the namespace are allowed.",
+	"spec": "Spec defines the matcher.",
 }
 
 func (RoleBindingRestriction) SwaggerDoc() map[string]string {
@@ -227,9 +219,8 @@ func (RoleBindingRestriction) SwaggerDoc() map[string]string {
 }
 
 var map_RoleBindingRestrictionList = map[string]string{
-	"":         "RoleBindingRestrictionList is a collection of RoleBindingRestriction objects.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of RoleBindingRestriction objects.",
+	"":      "RoleBindingRestrictionList is a collection of RoleBindingRestriction objects.",
+	"items": "Items is a list of RoleBindingRestriction objects.",
 }
 
 func (RoleBindingRestrictionList) SwaggerDoc() map[string]string {
@@ -248,9 +239,8 @@ func (RoleBindingRestrictionSpec) SwaggerDoc() map[string]string {
 }
 
 var map_RoleList = map[string]string{
-	"":         "RoleList is a collection of Roles",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of Roles",
+	"":      "RoleList is a collection of Roles",
+	"items": "Items is a list of Roles",
 }
 
 func (RoleList) SwaggerDoc() map[string]string {
diff --git a/build/v1/generated.proto b/build/v1/generated.proto
index cb374e22e4e..2aa49f421e4 100644
--- a/build/v1/generated.proto
+++ b/build/v1/generated.proto
@@ -14,7 +14,6 @@ option go_package = "v1";
 
 // BinaryBuildRequestOptions are the options required to fully speficy a binary build request
 message BinaryBuildRequestOptions {
-  // metadata for BinaryBuildRequestOptions.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // asFile determines if the binary should be created as a file within the source rather than extracted as an archive
@@ -60,7 +59,6 @@ message BitbucketWebHookCause {
 // Build encapsulates the inputs needed to produce a new deployable image, as well as
 // the status of the execution and a reference to the Pod which executed the build.
 message Build {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // spec is all the inputs used to execute the build.
@@ -74,7 +72,6 @@ message Build {
 //
 // Each build created by a build configuration is numbered and refers back to its parent configuration. Multiple builds can be triggered at once. Builds that do not have "output" set can be used to test code or run a verification build.
 message BuildConfig {
-  // metadata for BuildConfig.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // spec holds all the input necessary to produce a new build, and the conditions when
@@ -87,7 +84,6 @@ message BuildConfig {
 
 // BuildConfigList is a collection of BuildConfigs.
 message BuildConfigList {
-  // metadata for BuildConfigList.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // items is a list of build configs
@@ -128,7 +124,6 @@ message BuildConfigStatus {
 
 // BuildList is a collection of Builds.
 message BuildList {
-  // metadata for BuildList.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // items is a list of builds
@@ -297,7 +292,6 @@ message BuildPostCommitSpec {
 
 // BuildRequest is the resource used to pass parameters to build generator
 message BuildRequest {
-  // metadata for BuildRequest.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // revision is the information from the source for a specific repo snapshot.
diff --git a/build/v1/types.go b/build/v1/types.go
index 82bb7883ad7..13a0f8cea3d 100644
--- a/build/v1/types.go
+++ b/build/v1/types.go
@@ -16,8 +16,7 @@ import (
 // Build encapsulates the inputs needed to produce a new deployable image, as well as
 // the status of the execution and a reference to the Pod which executed the build.
 type Build struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// spec is all the inputs used to execute the build.
@@ -874,8 +873,7 @@ type ImageLabel struct {
 //
 // Each build created by a build configuration is numbered and refers back to its parent configuration. Multiple builds can be triggered at once. Builds that do not have "output" set can be used to test code or run a verification build.
 type BuildConfig struct {
-	metav1.TypeMeta `json:",inline"`
-	// metadata for BuildConfig.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// spec holds all the input necessary to produce a new build, and the conditions when
@@ -1035,7 +1033,6 @@ const (
 // BuildList is a collection of Builds.
 type BuildList struct {
 	metav1.TypeMeta `json:",inline"`
-	// metadata for BuildList.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// items is a list of builds
@@ -1047,7 +1044,6 @@ type BuildList struct {
 // BuildConfigList is a collection of BuildConfigs.
 type BuildConfigList struct {
 	metav1.TypeMeta `json:",inline"`
-	// metadata for BuildConfigList.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// items is a list of build configs
@@ -1115,8 +1111,7 @@ type SourceStrategyOptions struct {
 
 // BuildRequest is the resource used to pass parameters to build generator
 type BuildRequest struct {
-	metav1.TypeMeta `json:",inline"`
-	// metadata for BuildRequest.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// revision is the information from the source for a specific repo snapshot.
@@ -1154,8 +1149,7 @@ type BuildRequest struct {
 
 // BinaryBuildRequestOptions are the options required to fully speficy a binary build request
 type BinaryBuildRequestOptions struct {
-	metav1.TypeMeta `json:",inline"`
-	// metadata for BinaryBuildRequestOptions.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// asFile determines if the binary should be created as a file within the source rather than extracted as an archive
diff --git a/build/v1/zz_generated.swagger_doc_generated.go b/build/v1/zz_generated.swagger_doc_generated.go
index 1436e655437..affa774e176 100644
--- a/build/v1/zz_generated.swagger_doc_generated.go
+++ b/build/v1/zz_generated.swagger_doc_generated.go
@@ -13,7 +13,6 @@ package v1
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_BinaryBuildRequestOptions = map[string]string{
 	"":                        "BinaryBuildRequestOptions are the options required to fully speficy a binary build request",
-	"metadata":                "metadata for BinaryBuildRequestOptions.",
 	"asFile":                  "asFile determines if the binary should be created as a file within the source rather than extracted as an archive",
 	"revision.commit":         "revision.commit is the value identifying a specific commit",
 	"revision.message":        "revision.message is the description of a specific commit",
@@ -45,10 +44,9 @@ func (BitbucketWebHookCause) SwaggerDoc() map[string]string {
 }
 
 var map_Build = map[string]string{
-	"":         "Build encapsulates the inputs needed to produce a new deployable image, as well as the status of the execution and a reference to the Pod which executed the build.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec is all the inputs used to execute the build.",
-	"status":   "status is the current status of the build.",
+	"":       "Build encapsulates the inputs needed to produce a new deployable image, as well as the status of the execution and a reference to the Pod which executed the build.",
+	"spec":   "spec is all the inputs used to execute the build.",
+	"status": "status is the current status of the build.",
 }
 
 func (Build) SwaggerDoc() map[string]string {
@@ -56,10 +54,9 @@ func (Build) SwaggerDoc() map[string]string {
 }
 
 var map_BuildConfig = map[string]string{
-	"":         "Build configurations define a build process for new container images. There are three types of builds possible - a container image build using a Dockerfile, a Source-to-Image build that uses a specially prepared base image that accepts source code that it can make runnable, and a custom build that can run // arbitrary container images as a base and accept the build parameters. Builds run on the cluster and on completion are pushed to the container image registry specified in the \"output\" section. A build can be triggered via a webhook, when the base image changes, or when a user manually requests a new build be // created.\n\nEach build created by a build configuration is numbered and refers back to its parent configuration. Multiple builds can be triggered at once. Builds that do not have \"output\" set can be used to test code or run a verification build.",
-	"metadata": "metadata for BuildConfig.",
-	"spec":     "spec holds all the input necessary to produce a new build, and the conditions when to trigger them.",
-	"status":   "status holds any relevant information about a build config",
+	"":       "Build configurations define a build process for new container images. There are three types of builds possible - a container image build using a Dockerfile, a Source-to-Image build that uses a specially prepared base image that accepts source code that it can make runnable, and a custom build that can run // arbitrary container images as a base and accept the build parameters. Builds run on the cluster and on completion are pushed to the container image registry specified in the \"output\" section. A build can be triggered via a webhook, when the base image changes, or when a user manually requests a new build be // created.\n\nEach build created by a build configuration is numbered and refers back to its parent configuration. Multiple builds can be triggered at once. Builds that do not have \"output\" set can be used to test code or run a verification build.",
+	"spec":   "spec holds all the input necessary to produce a new build, and the conditions when to trigger them.",
+	"status": "status holds any relevant information about a build config",
 }
 
 func (BuildConfig) SwaggerDoc() map[string]string {
@@ -67,9 +64,8 @@ func (BuildConfig) SwaggerDoc() map[string]string {
 }
 
 var map_BuildConfigList = map[string]string{
-	"":         "BuildConfigList is a collection of BuildConfigs.",
-	"metadata": "metadata for BuildConfigList.",
-	"items":    "items is a list of build configs",
+	"":      "BuildConfigList is a collection of BuildConfigs.",
+	"items": "items is a list of build configs",
 }
 
 func (BuildConfigList) SwaggerDoc() map[string]string {
@@ -98,9 +94,8 @@ func (BuildConfigStatus) SwaggerDoc() map[string]string {
 }
 
 var map_BuildList = map[string]string{
-	"":         "BuildList is a collection of Builds.",
-	"metadata": "metadata for BuildList.",
-	"items":    "items is a list of builds",
+	"":      "BuildList is a collection of Builds.",
+	"items": "items is a list of builds",
 }
 
 func (BuildList) SwaggerDoc() map[string]string {
@@ -157,7 +152,6 @@ func (BuildPostCommitSpec) SwaggerDoc() map[string]string {
 
 var map_BuildRequest = map[string]string{
 	"":                      "BuildRequest is the resource used to pass parameters to build generator",
-	"metadata":              "metadata for BuildRequest.",
 	"revision":              "revision is the information from the source for a specific repo snapshot.",
 	"triggeredByImage":      "triggeredByImage is the Image that triggered this build.",
 	"from":                  "from is the reference to the ImageStreamTag that triggered the build.",
diff --git a/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml b/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
index 1319141241d..e2d2bcf2869 100644
--- a/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
+++ b/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: operatorhubs
     singular: operatorhub
   scope: Cluster
+  preserveUnknownField: false
   subresources:
     status: {}
   version: v1
diff --git a/config/v1/0000_03_config-operator_01_proxy.crd.yaml b/config/v1/0000_03_config-operator_01_proxy.crd.yaml
index 35d92449d37..a65f38418ed 100644
--- a/config/v1/0000_03_config-operator_01_proxy.crd.yaml
+++ b/config/v1/0000_03_config-operator_01_proxy.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: config.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
diff --git a/config/v1/0000_10_config-operator_01_apiserver.crd.yaml b/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
index 28f051d1db6..58c0067f09e 100644
--- a/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: config.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   names:
     kind: APIServer
     singular: apiserver
diff --git a/config/v1/0000_10_config-operator_01_authentication.crd.yaml b/config/v1/0000_10_config-operator_01_authentication.crd.yaml
index a5e3479f5c8..501c8f064d2 100644
--- a/config/v1/0000_10_config-operator_01_authentication.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_authentication.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: authentications
     singular: authentication
   scope: Cluster
+  preserveUnknownField: false
   subresources:
     status: {}
   versions:
@@ -36,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_build.crd.yaml b/config/v1/0000_10_config-operator_01_build.crd.yaml
index 1f11db48d5f..984b30b72b9 100644
--- a/config/v1/0000_10_config-operator_01_build.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_build.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: config.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   names:
     kind: Build
     singular: build
diff --git a/config/v1/0000_10_config-operator_01_console.crd.yaml b/config/v1/0000_10_config-operator_01_console.crd.yaml
index 8d07e581fd8..33791bc223b 100644
--- a/config/v1/0000_10_config-operator_01_console.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_console.crd.yaml
@@ -4,6 +4,7 @@ metadata:
   name: consoles.config.openshift.io
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: config.openshift.io
   names:
     kind: Console
@@ -36,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_dns.crd.yaml b/config/v1/0000_10_config-operator_01_dns.crd.yaml
index dba624615a2..b500a2d61b4 100644
--- a/config/v1/0000_10_config-operator_01_dns.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_dns.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: dnses
     singular: dns
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -35,7 +36,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_featuregate.crd.yaml b/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
index fedbdb813e7..f2ccf3a4ea2 100644
--- a/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
@@ -6,6 +6,7 @@ spec:
   group: config.openshift.io
   version: v1
   scope: Cluster
+  preserveUnknownField: false
   names:
     kind: FeatureGate
     singular: featuregate
@@ -36,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_image.crd.yaml b/config/v1/0000_10_config-operator_01_image.crd.yaml
index 17ef929904d..edca7327a3d 100644
--- a/config/v1/0000_10_config-operator_01_image.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_image.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: config.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   names:
     kind: Image
     singular: image
@@ -39,7 +40,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
index 39bccd24e67..03e59e5ea62 100644
--- a/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: infrastructures
     singular: infrastructure
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -33,7 +34,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_ingress.crd.yaml b/config/v1/0000_10_config-operator_01_ingress.crd.yaml
index 2812ce85b2a..1505254e3bb 100644
--- a/config/v1/0000_10_config-operator_01_ingress.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_ingress.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: ingresses
     singular: ingress
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -35,7 +36,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_network.crd.yaml b/config/v1/0000_10_config-operator_01_network.crd.yaml
index 4eacca11bf7..2335dd8e7e7 100644
--- a/config/v1/0000_10_config-operator_01_network.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_network.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: networks
     singular: network
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -36,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration. As a general
diff --git a/config/v1/0000_10_config-operator_01_oauth.crd.yaml b/config/v1/0000_10_config-operator_01_oauth.crd.yaml
index 6a7b43ccb4d..acc4fbb1330 100644
--- a/config/v1/0000_10_config-operator_01_oauth.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_oauth.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: oauths
     singular: oauth
   scope: Cluster
+  preserveUnknownField: false
   subresources:
     status: {}
   versions:
diff --git a/config/v1/0000_10_config-operator_01_project.crd.yaml b/config/v1/0000_10_config-operator_01_project.crd.yaml
index c1feca7b4cb..2361b3563f9 100644
--- a/config/v1/0000_10_config-operator_01_project.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_project.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: config.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -35,7 +36,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/0000_10_config-operator_01_scheduler.crd.yaml b/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
index 43c9d8b2bb2..9ba0956ba39 100644
--- a/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
+++ b/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: config.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   names:
     kind: Scheduler
     singular: scheduler
@@ -36,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/config/v1/types.go b/config/v1/types.go
index ca36f677750..dcec0ccf5db 100644
--- a/config/v1/types.go
+++ b/config/v1/types.go
@@ -167,6 +167,7 @@ type AdmissionPluginConfig struct {
 	// Configuration is an embedded configuration object to be used as the plugin's
 	// configuration. If present, it will be used instead of the path to the configuration file.
 	// +nullable
+	// +kubebuilder:validation:PreserveUnknownFields
 	Configuration runtime.RawExtension `json:"configuration"`
 }
 
@@ -210,6 +211,7 @@ type AuditConfig struct {
 	// as the audit policy configuration. If present, it will be used instead of
 	// the path to the policy file.
 	// +nullable
+	// +kubebuilder:validation:PreserveUnknownFields
 	PolicyConfiguration runtime.RawExtension `json:"policyConfiguration"`
 
 	// Format of saved audits (legacy or json).
diff --git a/config/v1/types_authentication.go b/config/v1/types_authentication.go
index 0722ddbfc76..eecfe75e7c1 100644
--- a/config/v1/types_authentication.go
+++ b/config/v1/types_authentication.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // Authentication specifies cluster-wide settings for authentication (like OAuth and
 // webhook token authenticators). The canonical name of an instance is `cluster`.
 type Authentication struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -77,7 +76,6 @@ type AuthenticationStatus struct {
 
 type AuthenticationList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
 
 	Items []Authentication `json:"items"`
diff --git a/config/v1/types_build.go b/config/v1/types_build.go
index fa4088ca7e7..ef4512aa170 100644
--- a/config/v1/types_build.go
+++ b/config/v1/types_build.go
@@ -16,6 +16,7 @@ import (
 type Build struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
+
 	// Spec holds user-settable values for the build controller configuration
 	// +kubebuilder:validation:Required
 	// +required
@@ -102,7 +103,7 @@ type BuildOverrides struct {
 
 type BuildList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Build `json:"items"`
+
+	Items []Build `json:"items"`
 }
diff --git a/config/v1/types_cluster_operator.go b/config/v1/types_cluster_operator.go
index af2ce846cab..f29fe549010 100644
--- a/config/v1/types_cluster_operator.go
+++ b/config/v1/types_cluster_operator.go
@@ -57,6 +57,7 @@ type ClusterOperatorStatus struct {
 	// operator which owns this status object.
 	// +nullable
 	// +optional
+	// +kubebuilder:validation:PreserveUnknownFields
 	Extension runtime.RawExtension `json:"extension"`
 }
 
diff --git a/config/v1/types_console.go b/config/v1/types_console.go
index 9cda3f83b6d..22b0b5160ae 100644
--- a/config/v1/types_console.go
+++ b/config/v1/types_console.go
@@ -10,8 +10,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // logout URL, and reports the public URL of the console. The canonical name is
 // `cluster`.
 type Console struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -40,9 +39,9 @@ type ConsoleStatus struct {
 
 type ConsoleList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Console `json:"items"`
+
+	Items []Console `json:"items"`
 }
 
 // ConsoleAuthentication defines a list of optional configuration for console authentication.
@@ -58,6 +57,6 @@ type ConsoleAuthentication struct {
 	// provides the user the option to perform single logout (SLO) through the identity
 	// provider to destroy their single sign-on session.
 	// +optional
-	// +kubebuilder:validation:Pattern=^$|^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$
+	// +kubebuilder:validation:Pattern=`^$|^((https):\/\/?)[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/?))$`
 	LogoutRedirect string `json:"logoutRedirect,omitempty"`
 }
diff --git a/config/v1/types_dns.go b/config/v1/types_dns.go
index ef04f7a67f7..989ef99c3cd 100644
--- a/config/v1/types_dns.go
+++ b/config/v1/types_dns.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // DNS holds cluster-wide information about DNS. The canonical name is `cluster`
 type DNS struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -82,7 +81,7 @@ type DNSStatus struct {
 
 type DNSList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []DNS `json:"items"`
+
+	Items []DNS `json:"items"`
 }
diff --git a/config/v1/types_feature.go b/config/v1/types_feature.go
index af8e1321785..0dceba6b322 100644
--- a/config/v1/types_feature.go
+++ b/config/v1/types_feature.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // Feature holds cluster-wide information about feature gates.  The canonical name is `cluster`
 type FeatureGate struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -76,9 +75,9 @@ type FeatureGateStatus struct {
 
 type FeatureGateList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []FeatureGate `json:"items"`
+
+	Items []FeatureGate `json:"items"`
 }
 
 type FeatureGateEnabledDisabled struct {
diff --git a/config/v1/types_image.go b/config/v1/types_image.go
index 94eb7411676..bf594c1b775 100644
--- a/config/v1/types_image.go
+++ b/config/v1/types_image.go
@@ -13,8 +13,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // When exposing OpenShift's image registry to the public, this also lets cluster
 // admins specify the external hostname.
 type Image struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -80,9 +79,9 @@ type ImageStatus struct {
 
 type ImageList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Image `json:"items"`
+
+	Items []Image `json:"items"`
 }
 
 // RegistryLocation contains a location of the registry specified by the registry domain
diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go
index f8f5b94974f..ac1e5048ee1 100644
--- a/config/v1/types_infrastructure.go
+++ b/config/v1/types_infrastructure.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // Infrastructure holds cluster-wide information about Infrastructure.  The canonical name is `cluster`
 type Infrastructure struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -236,7 +235,7 @@ type OvirtPlatformStatus struct {
 // InfrastructureList is
 type InfrastructureList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Infrastructure `json:"items"`
+
+	Items []Infrastructure `json:"items"`
 }
diff --git a/config/v1/types_ingress.go b/config/v1/types_ingress.go
index d161eb8476c..0216919ad8e 100644
--- a/config/v1/types_ingress.go
+++ b/config/v1/types_ingress.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // Ingress holds cluster-wide information about ingress, including the default ingress domain
 // used for routes. The canonical name is `cluster`.
 type Ingress struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -41,7 +40,7 @@ type IngressStatus struct {
 
 type IngressList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Ingress `json:"items"`
+
+	Items []Ingress `json:"items"`
 }
diff --git a/config/v1/types_network.go b/config/v1/types_network.go
index 9a88fb5d1b2..a09c5fe8ed3 100644
--- a/config/v1/types_network.go
+++ b/config/v1/types_network.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc.
 // Please view network.spec for an explanation on what applies when configuring this resource.
 type Network struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration.
@@ -117,7 +116,7 @@ type ExternalIPPolicy struct {
 
 type NetworkList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Network `json:"items"`
+
+	Items []Network `json:"items"`
 }
diff --git a/config/v1/types_project.go b/config/v1/types_project.go
index 61152a6f791..244ce3ef8fd 100644
--- a/config/v1/types_project.go
+++ b/config/v1/types_project.go
@@ -8,8 +8,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // Project holds cluster-wide information about Project.  The canonical name is `cluster`
 type Project struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -49,7 +48,7 @@ type ProjectStatus struct {
 
 type ProjectList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Project `json:"items"`
+
+	Items []Project `json:"items"`
 }
diff --git a/config/v1/types_proxy.go b/config/v1/types_proxy.go
index 1413a48caa4..93f4c487e49 100644
--- a/config/v1/types_proxy.go
+++ b/config/v1/types_proxy.go
@@ -12,6 +12,7 @@ import (
 type Proxy struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
+
 	// Spec holds user-settable values for the proxy configuration
 	// +kubebuilder:validation:Required
 	// +required
@@ -83,7 +84,7 @@ type ProxyStatus struct {
 
 type ProxyList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Proxy `json:"items"`
+
+	Items []Proxy `json:"items"`
 }
diff --git a/config/v1/types_scheduling.go b/config/v1/types_scheduling.go
index 9b8fa3a52ac..d5bf0c36275 100644
--- a/config/v1/types_scheduling.go
+++ b/config/v1/types_scheduling.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // Scheduler holds cluster-wide config information to run the Kubernetes Scheduler
 // and influence its placement decisions. The canonical name for this config is `cluster`.
 type Scheduler struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -69,7 +68,7 @@ type SchedulerStatus struct {
 
 type SchedulerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Scheduler `json:"items"`
+
+	Items []Scheduler `json:"items"`
 }
diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go
index c105bed88e6..5652b5a51cb 100644
--- a/config/v1/zz_generated.swagger_doc_generated.go
+++ b/config/v1/zz_generated.swagger_doc_generated.go
@@ -290,24 +290,15 @@ func (APIServerSpec) SwaggerDoc() map[string]string {
 }
 
 var map_Authentication = map[string]string{
-	"":         "Authentication specifies cluster-wide settings for authentication (like OAuth and webhook token authenticators). The canonical name of an instance is `cluster`.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Authentication specifies cluster-wide settings for authentication (like OAuth and webhook token authenticators). The canonical name of an instance is `cluster`.",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Authentication) SwaggerDoc() map[string]string {
 	return map_Authentication
 }
 
-var map_AuthenticationList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (AuthenticationList) SwaggerDoc() map[string]string {
-	return map_AuthenticationList
-}
-
 var map_AuthenticationSpec = map[string]string{
 	"type":                       "type identifies the cluster managed, user facing authentication mode in use. Specifically, it manages the component that responds to login attempts. The default is IntegratedOAuth.",
 	"oauthMetadata":              "oauthMetadata contains the discovery endpoint data for OAuth 2.0 Authorization Server Metadata for an external OAuth server. This discovery document can be viewed from its served location: oc get --raw '/.well-known/oauth-authorization-server' For further details, see the IETF Draft: https://tools.ietf.org/html/draft-ietf-oauth-discovery-04#section-2 If oauthMetadata.name is non-empty, this value has precedence over any metadata reference stored in status. The key \"oauthMetadata\" is used to locate the data. If specified and the config map or expected key is not found, no metadata is served. If the specified metadata is not valid, no metadata is served. The namespace for this config map is openshift-config.",
@@ -356,14 +347,6 @@ func (BuildDefaults) SwaggerDoc() map[string]string {
 	return map_BuildDefaults
 }
 
-var map_BuildList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (BuildList) SwaggerDoc() map[string]string {
-	return map_BuildList
-}
-
 var map_BuildOverrides = map[string]string{
 	"imageLabels":  "ImageLabels is a list of docker labels that are applied to the resulting image. If user provided a label in their Build/BuildConfig with the same name as one in this list, the user's label will be overwritten.",
 	"nodeSelector": "NodeSelector is a selector which must be true for the build pod to fit on a node",
@@ -549,10 +532,9 @@ func (UpdateHistory) SwaggerDoc() map[string]string {
 }
 
 var map_Console = map[string]string{
-	"":         "Console holds cluster-wide configuration for the web console, including the logout URL, and reports the public URL of the console. The canonical name is `cluster`.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Console holds cluster-wide configuration for the web console, including the logout URL, and reports the public URL of the console. The canonical name is `cluster`.",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Console) SwaggerDoc() map[string]string {
@@ -568,14 +550,6 @@ func (ConsoleAuthentication) SwaggerDoc() map[string]string {
 	return map_ConsoleAuthentication
 }
 
-var map_ConsoleList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ConsoleList) SwaggerDoc() map[string]string {
-	return map_ConsoleList
-}
-
 var map_ConsoleSpec = map[string]string{
 	"": "ConsoleSpec is the specification of the desired behavior of the Console.",
 }
@@ -594,24 +568,15 @@ func (ConsoleStatus) SwaggerDoc() map[string]string {
 }
 
 var map_DNS = map[string]string{
-	"":         "DNS holds cluster-wide information about DNS. The canonical name is `cluster`",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "DNS holds cluster-wide information about DNS. The canonical name is `cluster`",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (DNS) SwaggerDoc() map[string]string {
 	return map_DNS
 }
 
-var map_DNSList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (DNSList) SwaggerDoc() map[string]string {
-	return map_DNSList
-}
-
 var map_DNSSpec = map[string]string{
 	"baseDomain":  "baseDomain is the base domain of the cluster. All managed DNS records will be sub-domains of this base.\n\nFor example, given the base domain `openshift.example.com`, an API server DNS record may be created for `cluster-api.openshift.example.com`.\n\nOnce set, this field cannot be changed.",
 	"publicZone":  "publicZone is the location where all the DNS records that are publicly accessible to the internet exist.\n\nIf this field is nil, no public records should be created.\n\nOnce set, this field cannot be changed.",
@@ -642,24 +607,15 @@ func (CustomFeatureGates) SwaggerDoc() map[string]string {
 }
 
 var map_FeatureGate = map[string]string{
-	"":         "Feature holds cluster-wide information about feature gates.  The canonical name is `cluster`",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Feature holds cluster-wide information about feature gates.  The canonical name is `cluster`",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (FeatureGate) SwaggerDoc() map[string]string {
 	return map_FeatureGate
 }
 
-var map_FeatureGateList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (FeatureGateList) SwaggerDoc() map[string]string {
-	return map_FeatureGateList
-}
-
 var map_FeatureGateSelection = map[string]string{
 	"featureSet":      "featureSet changes the list of features in the cluster.  The default is empty.  Be very careful adjusting this setting. Turning on or off features may cause irreversible changes in your cluster which cannot be undone.",
 	"customNoUpgrade": "customNoUpgrade allows the enabling or disabling of any feature. Turning this feature set on IS NOT SUPPORTED, CANNOT BE UNDONE, and PREVENTS UPGRADES. Because of its nature, this setting cannot be validated.  If you have any typos or accidentally apply invalid combinations your cluster may fail in an unrecoverable way.  featureSet must equal \"CustomNoUpgrade\" must be set to use this field.",
@@ -670,24 +626,15 @@ func (FeatureGateSelection) SwaggerDoc() map[string]string {
 }
 
 var map_Image = map[string]string{
-	"":         "Image governs policies related to imagestream imports and runtime configuration for external registries. It allows cluster admins to configure which registries OpenShift is allowed to import images from, extra CA trust bundles for external registries, and policies to blacklist/whitelist registry hostnames. When exposing OpenShift's image registry to the public, this also lets cluster admins specify the external hostname.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Image governs policies related to imagestream imports and runtime configuration for external registries. It allows cluster admins to configure which registries OpenShift is allowed to import images from, extra CA trust bundles for external registries, and policies to blacklist/whitelist registry hostnames. When exposing OpenShift's image registry to the public, this also lets cluster admins specify the external hostname.",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Image) SwaggerDoc() map[string]string {
 	return map_Image
 }
 
-var map_ImageList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ImageList) SwaggerDoc() map[string]string {
-	return map_ImageList
-}
-
 var map_ImageSpec = map[string]string{
 	"allowedRegistriesForImport": "allowedRegistriesForImport limits the container image registries that normal users may import images from. Set this list to the registries that you trust to contain valid Docker images and that you want applications to be able to import from. Users with permission to create Images or ImageStreamMappings via the API are not affected by this policy - typically only administrators or system integrations will have those permissions.",
 	"externalRegistryHostnames":  "externalRegistryHostnames provides the hostnames for the default external image registry. The external hostname should be set only when the image registry is exposed externally. The first value is used in 'publicDockerImageRepository' field in ImageStreams. The value must be in \"hostname[:port]\" format.",
@@ -770,10 +717,9 @@ func (GCPPlatformStatus) SwaggerDoc() map[string]string {
 }
 
 var map_Infrastructure = map[string]string{
-	"":         "Infrastructure holds cluster-wide information about Infrastructure.  The canonical name is `cluster`",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Infrastructure holds cluster-wide information about Infrastructure.  The canonical name is `cluster`",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Infrastructure) SwaggerDoc() map[string]string {
@@ -781,8 +727,7 @@ func (Infrastructure) SwaggerDoc() map[string]string {
 }
 
 var map_InfrastructureList = map[string]string{
-	"":         "InfrastructureList is",
-	"metadata": "Standard object's metadata.",
+	"": "InfrastructureList is",
 }
 
 func (InfrastructureList) SwaggerDoc() map[string]string {
@@ -851,24 +796,15 @@ func (PlatformStatus) SwaggerDoc() map[string]string {
 }
 
 var map_Ingress = map[string]string{
-	"":         "Ingress holds cluster-wide information about ingress, including the default ingress domain used for routes. The canonical name is `cluster`.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Ingress holds cluster-wide information about ingress, including the default ingress domain used for routes. The canonical name is `cluster`.",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Ingress) SwaggerDoc() map[string]string {
 	return map_Ingress
 }
 
-var map_IngressList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (IngressList) SwaggerDoc() map[string]string {
-	return map_IngressList
-}
-
 var map_IngressSpec = map[string]string{
 	"domain": "domain is used to generate a default host name for a route when the route's host name is empty. The generated host name will follow this pattern: \"<route-name>.<route-namespace>.<domain>\".\n\nIt is also used as the default wildcard domain suffix for ingress. The default ingresscontroller domain will follow this pattern: \"*.<domain>\".\n\nOnce set, changing domain is not currently supported.",
 }
@@ -908,24 +844,15 @@ func (ExternalIPPolicy) SwaggerDoc() map[string]string {
 }
 
 var map_Network = map[string]string{
-	"":         "Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc. Please view network.spec for an explanation on what applies when configuring this resource.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc. Please view network.spec for an explanation on what applies when configuring this resource.",
+	"spec":   "spec holds user settable values for configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Network) SwaggerDoc() map[string]string {
 	return map_Network
 }
 
-var map_NetworkList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (NetworkList) SwaggerDoc() map[string]string {
-	return map_NetworkList
-}
-
 var map_NetworkSpec = map[string]string{
 	"":               "NetworkSpec is the desired network configuration. As a general rule, this SHOULD NOT be read directly. Instead, you should consume the NetworkStatus, as it indicates the currently deployed configuration. Currently, most spec fields are immutable after installation. Please view the individual ones for further details on each.",
 	"clusterNetwork": "IP address pool to use for pod IPs. This field is immutable after installation.",
@@ -1225,24 +1152,15 @@ func (OperatorHubStatus) SwaggerDoc() map[string]string {
 }
 
 var map_Project = map[string]string{
-	"":         "Project holds cluster-wide information about Project.  The canonical name is `cluster`",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Project holds cluster-wide information about Project.  The canonical name is `cluster`",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Project) SwaggerDoc() map[string]string {
 	return map_Project
 }
 
-var map_ProjectList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ProjectList) SwaggerDoc() map[string]string {
-	return map_ProjectList
-}
-
 var map_ProjectSpec = map[string]string{
 	"":                       "ProjectSpec holds the project creation configuration.",
 	"projectRequestMessage":  "projectRequestMessage is the string presented to a user if they are unable to request a project via the projectrequest api endpoint",
@@ -1272,14 +1190,6 @@ func (Proxy) SwaggerDoc() map[string]string {
 	return map_Proxy
 }
 
-var map_ProxyList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ProxyList) SwaggerDoc() map[string]string {
-	return map_ProxyList
-}
-
 var map_ProxySpec = map[string]string{
 	"":                   "ProxySpec contains cluster proxy creation configuration.",
 	"httpProxy":          "httpProxy is the URL of the proxy for HTTP requests.  Empty means unset and will not result in an env var.",
@@ -1305,24 +1215,15 @@ func (ProxyStatus) SwaggerDoc() map[string]string {
 }
 
 var map_Scheduler = map[string]string{
-	"":         "Scheduler holds cluster-wide config information to run the Kubernetes Scheduler and influence its placement decisions. The canonical name for this config is `cluster`.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
-	"status":   "status holds observed values from the cluster. They may not be overridden.",
+	"":       "Scheduler holds cluster-wide config information to run the Kubernetes Scheduler and influence its placement decisions. The canonical name for this config is `cluster`.",
+	"spec":   "spec holds user settable values for configuration",
+	"status": "status holds observed values from the cluster. They may not be overridden.",
 }
 
 func (Scheduler) SwaggerDoc() map[string]string {
 	return map_Scheduler
 }
 
-var map_SchedulerList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (SchedulerList) SwaggerDoc() map[string]string {
-	return map_SchedulerList
-}
-
 var map_SchedulerSpec = map[string]string{
 	"policy":              "policy is a reference to a ConfigMap containing scheduler policy which has user specified predicates and priorities. If this ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider. The namespace for this configmap is openshift-config.",
 	"defaultNodeSelector": "defaultNodeSelector helps set the cluster-wide default node selector to restrict pod placement to specific nodes. This is applied to the pods created in all namespaces without a specified nodeSelector value. For example, defaultNodeSelector: \"type=user-node,region=east\" would set nodeSelector field in pod spec to \"type=user-node,region=east\" to all pods created in all namespaces. Namespaces having project-wide node selectors won't be impacted even if this field is set. This adds an annotation section to the namespace. For example, if a new namespace is created with node-selector='type=user-node,region=east', the annotation openshift.io/node-selector: type=user-node,region=east gets added to the project. When the openshift.io/node-selector annotation is set on the project the value is used in preference to the value we are setting for defaultNodeSelector field. For instance, openshift.io/node-selector: \"type=user-node,region=west\" means that the default of \"type=user-node,region=east\" set in defaultNodeSelector would not be applied.",
diff --git a/console/v1/0000_10_config-operator_01_consoleclidownload.crd.yaml b/console/v1/0000_10_config-operator_01_consoleclidownload.crd.yaml
index 5dbe0acd168..b308ae2b231 100644
--- a/console/v1/0000_10_config-operator_01_consoleclidownload.crd.yaml
+++ b/console/v1/0000_10_config-operator_01_consoleclidownload.crd.yaml
@@ -8,6 +8,7 @@ metadata:
       (CLI) downloads.
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
   - name: v1
@@ -49,7 +50,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleCLIDownloadSpec is the desired cli download configuration.
diff --git a/console/v1/0000_10_config-operator_01_consoleexternalloglink.crd.yaml b/console/v1/0000_10_config-operator_01_consoleexternalloglink.crd.yaml
index 7d754730186..0437cfddc10 100644
--- a/console/v1/0000_10_config-operator_01_consoleexternalloglink.crd.yaml
+++ b/console/v1/0000_10_config-operator_01_consoleexternalloglink.crd.yaml
@@ -8,6 +8,7 @@ metadata:
       web console log links.
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
   - name: v1
@@ -49,7 +50,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleExternalLogLinkSpec is the desired log link configuration.
diff --git a/console/v1/0000_10_config-operator_01_consolelink.crd.yaml b/console/v1/0000_10_config-operator_01_consolelink.crd.yaml
index 970cd3231cc..eb76dff141f 100644
--- a/console/v1/0000_10_config-operator_01_consolelink.crd.yaml
+++ b/console/v1/0000_10_config-operator_01_consolelink.crd.yaml
@@ -7,6 +7,7 @@ metadata:
     description: Extension for customizing OpenShift web console links
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
   - name: v1
@@ -51,7 +52,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleLinkSpec is the desired console link configuration.
diff --git a/console/v1/0000_10_config-operator_01_consolenotification.crd.yaml b/console/v1/0000_10_config-operator_01_consolenotification.crd.yaml
index 2c81d934730..b4982d47caa 100644
--- a/console/v1/0000_10_config-operator_01_consolenotification.crd.yaml
+++ b/console/v1/0000_10_config-operator_01_consolenotification.crd.yaml
@@ -7,6 +7,7 @@ metadata:
     description: Extension for configuring openshift web console notifications.
 spec:
   scope: Cluster
+  preserveUnknownField: false
   group: console.openshift.io
   versions:
   - name: v1
@@ -48,7 +49,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleNotificationSpec is the desired console notification
diff --git a/console/v1/0000_10_config-operator_01_consoleyamlsample.crd.yaml b/console/v1/0000_10_config-operator_01_consoleyamlsample.crd.yaml
index 03ee57cdd78..bd283a39d85 100644
--- a/console/v1/0000_10_config-operator_01_consoleyamlsample.crd.yaml
+++ b/console/v1/0000_10_config-operator_01_consoleyamlsample.crd.yaml
@@ -37,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: ConsoleYAMLSampleSpec is the desired YAML sample configuration.
diff --git a/console/v1/types.go b/console/v1/types.go
index 2a350a492ac..59b065f0738 100644
--- a/console/v1/types.go
+++ b/console/v1/types.go
@@ -5,6 +5,6 @@ type Link struct {
 	// text is the display text for the link
 	Text string `json:"text"`
 	// href is the absolute secure URL for the link (must use https)
-	// +kubebuilder:validation:Pattern=^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+	// +kubebuilder:validation:Pattern=`^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$`
 	Href string `json:"href"`
 }
diff --git a/console/v1/types_console_cli_download.go b/console/v1/types_console_cli_download.go
index d7f9367ff40..6f82da552a1 100644
--- a/console/v1/types_console_cli_download.go
+++ b/console/v1/types_console_cli_download.go
@@ -8,10 +8,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.
 type ConsoleCLIDownload struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              ConsoleCLIDownloadSpec `json:"spec"`
+
+	Spec ConsoleCLIDownloadSpec `json:"spec"`
 }
 
 // ConsoleCLIDownloadSpec is the desired cli download configuration.
@@ -29,7 +29,7 @@ type CLIDownloadLink struct {
 	// +optional
 	Text string `json:"text"`
 	// href is the absolute secure URL for the link (must use https)
-	// +kubebuilder:validation:Pattern=^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$
+	// +kubebuilder:validation:Pattern=`^https://([\w-]+.)+[\w-]+(/[\w- ./?%&=])?$`
 	Href string `json:"href"`
 }
 
@@ -37,7 +37,7 @@ type CLIDownloadLink struct {
 
 type ConsoleCLIDownloadList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []ConsoleCLIDownload `json:"items"`
+
+	Items []ConsoleCLIDownload `json:"items"`
 }
diff --git a/console/v1/types_console_external_log_links.go b/console/v1/types_console_external_log_links.go
index 9aecac768c7..2e771551292 100644
--- a/console/v1/types_console_external_log_links.go
+++ b/console/v1/types_console_external_log_links.go
@@ -8,10 +8,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // ConsoleExternalLogLink is an extension for customizing OpenShift web console log links.
 type ConsoleExternalLogLink struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              ConsoleExternalLogLinkSpec `json:"spec"`
+
+	Spec ConsoleExternalLogLinkSpec `json:"spec"`
 }
 
 // ConsoleExternalLogLinkSpec is the desired log link configuration.
@@ -34,13 +34,13 @@ type ConsoleExternalLogLinkSpec struct {
 	//             - e.g. `{"key1":"value1","key2":"value2"}`
 	//
 	// e.g., https://example.com/logs?resourceName=${resourceName}&containerName=${containerName}&resourceNamespace=${resourceNamespace}&podLabels=${podLabels}
-	// +kubebuilder:validation:Pattern=^https://
+	// +kubebuilder:validation:Pattern=`^https://`
 	HrefTemplate string `json:"hrefTemplate"`
 	// namespaceFilter is a regular expression used to restrict a log link to a
 	// matching set of namespaces (e.g., `^openshift-`). The string is converted
 	// into a regular expression using the JavaScript RegExp constructor.
 	// If not specified, links will be displayed for all the namespaces.
-	// + optional
+	// +optional
 	NamespaceFilter string `json:"namespaceFilter,omitempty"`
 }
 
@@ -48,7 +48,7 @@ type ConsoleExternalLogLinkSpec struct {
 
 type ConsoleExternalLogLinkList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []ConsoleExternalLogLink `json:"items"`
+
+	Items []ConsoleExternalLogLink `json:"items"`
 }
diff --git a/console/v1/types_console_link.go b/console/v1/types_console_link.go
index e276eb73ae5..297fd36bffc 100644
--- a/console/v1/types_console_link.go
+++ b/console/v1/types_console_link.go
@@ -8,10 +8,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // ConsoleLink is an extension for customizing OpenShift web console links.
 type ConsoleLink struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              ConsoleLinkSpec `json:"spec"`
+
+	Spec ConsoleLinkSpec `json:"spec"`
 }
 
 // ConsoleLinkSpec is the desired console link configuration.
@@ -51,7 +51,7 @@ type NamespaceDashboardSpec struct {
 }
 
 // ConsoleLinkLocationSelector is a set of possible menu targets to which a link may be appended.
-// +kubebuilder:validation:Pattern=^(ApplicationMenu|HelpMenu|UserMenu|NamespaceDashboard)$
+// +kubebuilder:validation:Pattern=`^(ApplicationMenu|HelpMenu|UserMenu|NamespaceDashboard)$`
 type ConsoleLinkLocation string
 
 const (
@@ -69,7 +69,7 @@ const (
 
 type ConsoleLinkList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []ConsoleLink `json:"items"`
+
+	Items []ConsoleLink `json:"items"`
 }
diff --git a/console/v1/types_console_notification.go b/console/v1/types_console_notification.go
index 8f716036bd8..86b1cd86e85 100644
--- a/console/v1/types_console_notification.go
+++ b/console/v1/types_console_notification.go
@@ -8,10 +8,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // ConsoleNotification is the extension for configuring openshift web console notifications.
 type ConsoleNotification struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              ConsoleNotificationSpec `json:"spec"`
+
+	Spec ConsoleNotificationSpec `json:"spec"`
 }
 
 // ConsoleNotificationSpec is the desired console notification configuration.
@@ -34,7 +34,7 @@ type ConsoleNotificationSpec struct {
 
 // ConsoleNotificationLocationSelector is a set of possible notification targets
 // to which a notification may be appended.
-// +kubebuilder:validation:Pattern=^(BannerTop|BannerBottom|BannerTopBottom)$
+// +kubebuilder:validation:Pattern=`^(BannerTop|BannerBottom|BannerTopBottom)$`
 type ConsoleNotificationLocation string
 
 const (
@@ -50,7 +50,7 @@ const (
 
 type ConsoleNotificationList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []ConsoleNotification `json:"items"`
+
+	Items []ConsoleNotification `json:"items"`
 }
diff --git a/console/v1/types_console_yaml_sample.go b/console/v1/types_console_yaml_sample.go
index c352abb1741..0d4091f737d 100644
--- a/console/v1/types_console_yaml_sample.go
+++ b/console/v1/types_console_yaml_sample.go
@@ -8,10 +8,10 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 // ConsoleYAMLSample is an extension for customizing OpenShift web console YAML samples.
 type ConsoleYAMLSample struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata"`
-	Spec              ConsoleYAMLSampleSpec `json:"spec"`
+
+	Spec ConsoleYAMLSampleSpec `json:"spec"`
 }
 
 // ConsoleYAMLSampleSpec is the desired YAML sample configuration.
@@ -30,22 +30,22 @@ type ConsoleYAMLSampleSpec struct {
 }
 
 // ConsoleYAMLSampleTitle of the YAML sample.
-// +kubebuilder:validation:Pattern=^(.|\s)*\S(.|\s)*$
+// +kubebuilder:validation:Pattern=`^(.|\s)*\S(.|\s)*$`
 type ConsoleYAMLSampleTitle string
 
 // ConsoleYAMLSampleDescription of the YAML sample.
-// +kubebuilder:validation:Pattern=^(.|\s)*\S(.|\s)*$
+// +kubebuilder:validation:Pattern=`^(.|\s)*\S(.|\s)*$`
 type ConsoleYAMLSampleDescription string
 
 // ConsoleYAMLSampleYAML is the YAML sample to display.
-// +kubebuilder:validation:Pattern=^(.|\s)*\S(.|\s)*$
+// +kubebuilder:validation:Pattern=`^(.|\s)*\S(.|\s)*$`
 type ConsoleYAMLSampleYAML string
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type ConsoleYAMLSampleList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []ConsoleYAMLSample `json:"items"`
+
+	Items []ConsoleYAMLSample `json:"items"`
 }
diff --git a/console/v1/zz_generated.swagger_doc_generated.go b/console/v1/zz_generated.swagger_doc_generated.go
index 9d85f7957d1..e953fcc902a 100644
--- a/console/v1/zz_generated.swagger_doc_generated.go
+++ b/console/v1/zz_generated.swagger_doc_generated.go
@@ -31,22 +31,13 @@ func (CLIDownloadLink) SwaggerDoc() map[string]string {
 }
 
 var map_ConsoleCLIDownload = map[string]string{
-	"":         "ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.",
-	"metadata": "Standard object's metadata.",
+	"": "ConsoleCLIDownload is an extension for configuring openshift web console command line interface (CLI) downloads.",
 }
 
 func (ConsoleCLIDownload) SwaggerDoc() map[string]string {
 	return map_ConsoleCLIDownload
 }
 
-var map_ConsoleCLIDownloadList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ConsoleCLIDownloadList) SwaggerDoc() map[string]string {
-	return map_ConsoleCLIDownloadList
-}
-
 var map_ConsoleCLIDownloadSpec = map[string]string{
 	"":            "ConsoleCLIDownloadSpec is the desired cli download configuration.",
 	"displayName": "displayName is the display name of the CLI download.",
@@ -59,22 +50,13 @@ func (ConsoleCLIDownloadSpec) SwaggerDoc() map[string]string {
 }
 
 var map_ConsoleExternalLogLink = map[string]string{
-	"":         "ConsoleExternalLogLink is an extension for customizing OpenShift web console log links.",
-	"metadata": "Standard object's metadata.",
+	"": "ConsoleExternalLogLink is an extension for customizing OpenShift web console log links.",
 }
 
 func (ConsoleExternalLogLink) SwaggerDoc() map[string]string {
 	return map_ConsoleExternalLogLink
 }
 
-var map_ConsoleExternalLogLinkList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ConsoleExternalLogLinkList) SwaggerDoc() map[string]string {
-	return map_ConsoleExternalLogLinkList
-}
-
 var map_ConsoleExternalLogLinkSpec = map[string]string{
 	"":                "ConsoleExternalLogLinkSpec is the desired log link configuration. The log link will appear on the logs tab of the pod details page.",
 	"text":            "text is the display text for the link",
@@ -97,22 +79,13 @@ func (ApplicationMenuSpec) SwaggerDoc() map[string]string {
 }
 
 var map_ConsoleLink = map[string]string{
-	"":         "ConsoleLink is an extension for customizing OpenShift web console links.",
-	"metadata": "Standard object's metadata.",
+	"": "ConsoleLink is an extension for customizing OpenShift web console links.",
 }
 
 func (ConsoleLink) SwaggerDoc() map[string]string {
 	return map_ConsoleLink
 }
 
-var map_ConsoleLinkList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ConsoleLinkList) SwaggerDoc() map[string]string {
-	return map_ConsoleLinkList
-}
-
 var map_ConsoleLinkSpec = map[string]string{
 	"":                   "ConsoleLinkSpec is the desired console link configuration.",
 	"location":           "location determines which location in the console the link will be appended to (ApplicationMenu, HelpMenu, UserMenu, NamespaceDashboard).",
@@ -134,22 +107,13 @@ func (NamespaceDashboardSpec) SwaggerDoc() map[string]string {
 }
 
 var map_ConsoleNotification = map[string]string{
-	"":         "ConsoleNotification is the extension for configuring openshift web console notifications.",
-	"metadata": "Standard object's metadata.",
+	"": "ConsoleNotification is the extension for configuring openshift web console notifications.",
 }
 
 func (ConsoleNotification) SwaggerDoc() map[string]string {
 	return map_ConsoleNotification
 }
 
-var map_ConsoleNotificationList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ConsoleNotificationList) SwaggerDoc() map[string]string {
-	return map_ConsoleNotificationList
-}
-
 var map_ConsoleNotificationSpec = map[string]string{
 	"":                "ConsoleNotificationSpec is the desired console notification configuration.",
 	"text":            "text is the visible text of the notification.",
@@ -164,22 +128,13 @@ func (ConsoleNotificationSpec) SwaggerDoc() map[string]string {
 }
 
 var map_ConsoleYAMLSample = map[string]string{
-	"":         "ConsoleYAMLSample is an extension for customizing OpenShift web console YAML samples.",
-	"metadata": "Standard object's metadata.",
+	"": "ConsoleYAMLSample is an extension for customizing OpenShift web console YAML samples.",
 }
 
 func (ConsoleYAMLSample) SwaggerDoc() map[string]string {
 	return map_ConsoleYAMLSample
 }
 
-var map_ConsoleYAMLSampleList = map[string]string{
-	"metadata": "Standard object's metadata.",
-}
-
-func (ConsoleYAMLSampleList) SwaggerDoc() map[string]string {
-	return map_ConsoleYAMLSampleList
-}
-
 var map_ConsoleYAMLSampleSpec = map[string]string{
 	"":               "ConsoleYAMLSampleSpec is the desired YAML sample configuration. Samples will appear with their descriptions in a samples sidebar when creating a resources in the web console.",
 	"TargetResource": "targetResource contains apiVersion and kind of the resource YAML sample is representating.",
diff --git a/hack/alpha-build-machinery/make/targets/openshift/controller-gen.mk b/hack/alpha-build-machinery/make/targets/openshift/controller-gen.mk
index fd0ff401e80..8c9dcee7e07 100644
--- a/hack/alpha-build-machinery/make/targets/openshift/controller-gen.mk
+++ b/hack/alpha-build-machinery/make/targets/openshift/controller-gen.mk
@@ -1,29 +1,23 @@
 self_dir :=$(dir $(lastword $(MAKEFILE_LIST)))
 
-CONTROLLER_GEN_VERSION ?=v0.2.1
-CONTROLLER_GEN_TEMP ?=$(PERMANENT_TMP_GOPATH)/src/sigs.k8s.io/controller-tools
-controller_gen_gopath =$(shell realpath -m $(CONTROLLER_GEN_TEMP)/../..)
-CONTROLLER_GEN ?=$(CONTROLLER_GEN_TEMP)/controller-gen
+CONTROLLER_GEN_VERSION ?=v0.2.1-37-ga3cca5d
+CONTROLLER_GEN ?=$(PERMANENT_TMP_GOPATH)/bin/controller-gen
+controller_gen_dir :=$(dir $(CONTROLLER_GEN))
 
 ensure-controller-gen:
 ifeq "" "$(wildcard $(CONTROLLER_GEN))"
-	$(info Installing controller-gen into "$(CONTROLLER_GEN)")
-	mkdir -p '$(CONTROLLER_GEN_TEMP)'
-	git clone -b '$(CONTROLLER_GEN_VERSION)' --single-branch --depth=1 https://github.com/kubernetes-sigs/controller-tools.git '$(CONTROLLER_GEN_TEMP)'
-	@echo '$(CONTROLLER_GEN_TEMP)/../..'
-	cd '$(CONTROLLER_GEN_TEMP)' && export GO111MODULE=on GOPATH='$(controller_gen_gopath)' && $(GO) mod vendor 2>/dev/null && $(GO) build -mod=vendor ./cmd/controller-gen
+	$(info Installing controller-gen into '$(CONTROLLER_GEN)')
+	mkdir -p '$(controller_gen_dir)'
+	curl -s -f -L https://github.com/openshift/kubernetes-sigs-controller-tools/releases/download/$(CONTROLLER_GEN_VERSION)/controller-gen-$(GOHOSTOS)-$(GOHOSTARCH) -o '$(CONTROLLER_GEN)'
+	chmod +x '$(CONTROLLER_GEN)';
 else
 	$(info Using existing controller-gen from "$(CONTROLLER_GEN)")
 endif
 .PHONY: ensure-controller-gen
 
 clean-controller-gen:
-	if [ -d '$(controller_gen_gopath)/pkg/mod' ]; then chmod +w -R '$(controller_gen_gopath)/pkg/mod'; fi
-	$(RM) -r '$(CONTROLLER_GEN_TEMP)' '$(controller_gen_gopath)/pkg/mod'
-	@mkdir -p '$(CONTROLLER_GEN_TEMP)'  # to make sure we can do the next step and to avoid using '/*' wildcard on the line above which could go crazy on wrong substitution
-	if [ -d '$(CONTROLLER_GEN_TEMP)' ]; then rmdir --ignore-fail-on-non-empty -p '$(CONTROLLER_GEN_TEMP)'; fi
-	@mkdir -p '$(controller_gen_gopath)/pkg/mod'  # to make sure we can do the next step and to avoid using '/*' wildcard on the line above which could go crazy on wrong substitution
-	if [ -d '$(controller_gen_gopath)/pkg/mod' ]; then rmdir --ignore-fail-on-non-empty -p '$(controller_gen_gopath)/pkg/mod'; fi
+	$(RM) '$(CONTROLLER_GEN)'
+	if [ -d '$(controller_gen_dir)' ]; then rmdir --ignore-fail-on-non-empty -p '$(controller_gen_dir)'; fi
 .PHONY: clean-controller-gen
 
 clean: clean-controller-gen
diff --git a/image/v1/generated.proto b/image/v1/generated.proto
index b390adc7718..1a667589a60 100644
--- a/image/v1/generated.proto
+++ b/image/v1/generated.proto
@@ -33,7 +33,6 @@ message DockerImageReference {
 
 // Image is an immutable representation of a container image and metadata at a point in time.
 message Image {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // DockerImageReference is the string that can be used to pull this image.
@@ -41,6 +40,7 @@ message Image {
 
   // DockerImageMetadata contains metadata about this image
   // +patchStrategy=replace
+  // +kubebuilder:validation:PreserveUnknownFields
   optional k8s.io.apimachinery.pkg.runtime.RawExtension dockerImageMetadata = 3;
 
   // DockerImageMetadataVersion conveys the version of the object, which if empty defaults to "1.0"
@@ -142,7 +142,6 @@ message ImageLayerData {
 
 // ImageList is a list of Image objects.
 message ImageList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of images
@@ -166,7 +165,6 @@ message ImageLookupPolicy {
 // Mandatory fields should be parsed by clients doing image verification. The others are parsed from
 // signature's content by the server. They serve just an informative purpose.
 message ImageSignature {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Required: Describes a type of stored blob.
@@ -203,7 +201,6 @@ message ImageSignature {
 // when images are tagged in a stream, and an optional reference to a container image
 // repository on a registry.
 message ImageStream {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec describes the desired state of this stream
@@ -215,7 +212,6 @@ message ImageStream {
 
 // ImageStreamImage represents an Image that is retrieved by image name from an ImageStream.
 message ImageStreamImage {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Image associated with the ImageStream and image name.
@@ -231,7 +227,6 @@ message ImageStreamImage {
 // (for instance, to generate an application from it). Clients that know the desired image can continue
 // to create spec.tags directly into their image streams.
 message ImageStreamImport {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec is a description of the images that the user wishes to import
@@ -270,7 +265,6 @@ message ImageStreamImportStatus {
 // ImageStreamLayers describes information about the layers referenced by images in this
 // image stream.
 message ImageStreamLayers {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // blobs is a map of blob name to metadata about the blob.
@@ -283,7 +277,6 @@ message ImageStreamLayers {
 
 // ImageStreamList is a list of ImageStream objects.
 message ImageStreamList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of imageStreams
@@ -293,7 +286,6 @@ message ImageStreamList {
 // ImageStreamMapping represents a mapping from a single tag to a container image as
 // well as the reference to the container image stream the image came from.
 message ImageStreamMapping {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Image is a container image.
@@ -339,7 +331,6 @@ message ImageStreamStatus {
 
 // ImageStreamTag represents an Image that is retrieved by tag name from an ImageStream.
 message ImageStreamTag {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // tag is the spec tag associated with this image stream tag, and it may be null
@@ -365,7 +356,6 @@ message ImageStreamTag {
 
 // ImageStreamTagList is a list of ImageStreamTag objects.
 message ImageStreamTagList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of image stream tags
diff --git a/image/v1/types.go b/image/v1/types.go
index 65249425008..ff89f400c0d 100644
--- a/image/v1/types.go
+++ b/image/v1/types.go
@@ -11,7 +11,6 @@ import (
 // ImageList is a list of Image objects.
 type ImageList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of images
@@ -24,14 +23,14 @@ type ImageList struct {
 
 // Image is an immutable representation of a container image and metadata at a point in time.
 type Image struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// DockerImageReference is the string that can be used to pull this image.
 	DockerImageReference string `json:"dockerImageReference,omitempty" protobuf:"bytes,2,opt,name=dockerImageReference"`
 	// DockerImageMetadata contains metadata about this image
 	// +patchStrategy=replace
+	// +kubebuilder:validation:PreserveUnknownFields
 	DockerImageMetadata runtime.RawExtension `json:"dockerImageMetadata,omitempty" patchStrategy:"replace" protobuf:"bytes,3,opt,name=dockerImageMetadata"`
 	// DockerImageMetadataVersion conveys the version of the object, which if empty defaults to "1.0"
 	DockerImageMetadataVersion string `json:"dockerImageMetadataVersion,omitempty" protobuf:"bytes,4,opt,name=dockerImageMetadataVersion"`
@@ -72,8 +71,7 @@ type ImageLayer struct {
 // Mandatory fields should be parsed by clients doing image verification. The others are parsed from
 // signature's content by the server. They serve just an informative purpose.
 type ImageSignature struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Required: Describes a type of stored blob.
@@ -150,7 +148,6 @@ type SignatureSubject struct {
 // ImageStreamList is a list of ImageStream objects.
 type ImageStreamList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of imageStreams
@@ -166,8 +163,7 @@ type ImageStreamList struct {
 // when images are tagged in a stream, and an optional reference to a container image
 // repository on a registry.
 type ImageStream struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec describes the desired state of this stream
@@ -337,8 +333,7 @@ type TagEventCondition struct {
 // ImageStreamMapping represents a mapping from a single tag to a container image as
 // well as the reference to the container image stream the image came from.
 type ImageStreamMapping struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Image is a container image.
@@ -353,8 +348,7 @@ type ImageStreamMapping struct {
 
 // ImageStreamTag represents an Image that is retrieved by tag name from an ImageStream.
 type ImageStreamTag struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// tag is the spec tag associated with this image stream tag, and it may be null
@@ -383,7 +377,6 @@ type ImageStreamTag struct {
 // ImageStreamTagList is a list of ImageStreamTag objects.
 type ImageStreamTagList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is the list of image stream tags
@@ -396,8 +389,7 @@ type ImageStreamTagList struct {
 
 // ImageStreamImage represents an Image that is retrieved by image name from an ImageStream.
 type ImageStreamImage struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Image associated with the ImageStream and image name.
@@ -423,9 +415,9 @@ type DockerImageReference struct {
 // ImageStreamLayers describes information about the layers referenced by images in this
 // image stream.
 type ImageStreamLayers struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// blobs is a map of blob name to metadata about the blob.
 	Blobs map[string]ImageLayerData `json:"blobs" protobuf:"bytes,2,rep,name=blobs"`
 	// images is a map between an image name and the names of the blobs and config that
@@ -474,8 +466,7 @@ type ImageLayerData struct {
 // (for instance, to generate an application from it). Clients that know the desired image can continue
 // to create spec.tags directly into their image streams.
 type ImageStreamImport struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec is a description of the images that the user wishes to import
diff --git a/image/v1/zz_generated.swagger_doc_generated.go b/image/v1/zz_generated.swagger_doc_generated.go
index a31b6316cbc..43e67e620b9 100644
--- a/image/v1/zz_generated.swagger_doc_generated.go
+++ b/image/v1/zz_generated.swagger_doc_generated.go
@@ -26,7 +26,6 @@ func (DockerImageReference) SwaggerDoc() map[string]string {
 
 var map_Image = map[string]string{
 	"":                             "Image is an immutable representation of a container image and metadata at a point in time.",
-	"metadata":                     "Standard object's metadata.",
 	"dockerImageReference":         "DockerImageReference is the string that can be used to pull this image.",
 	"dockerImageMetadata":          "DockerImageMetadata contains metadata about this image",
 	"dockerImageMetadataVersion":   "DockerImageMetadataVersion conveys the version of the object, which if empty defaults to \"1.0\"",
@@ -99,9 +98,8 @@ func (ImageLayerData) SwaggerDoc() map[string]string {
 }
 
 var map_ImageList = map[string]string{
-	"":         "ImageList is a list of Image objects.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of images",
+	"":      "ImageList is a list of Image objects.",
+	"items": "Items is a list of images",
 }
 
 func (ImageList) SwaggerDoc() map[string]string {
@@ -119,7 +117,6 @@ func (ImageLookupPolicy) SwaggerDoc() map[string]string {
 
 var map_ImageSignature = map[string]string{
 	"":              "ImageSignature holds a signature of an image. It allows to verify image identity and possibly other claims as long as the signature is trusted. Based on this information it is possible to restrict runnable images to those matching cluster-wide policy. Mandatory fields should be parsed by clients doing image verification. The others are parsed from signature's content by the server. They serve just an informative purpose.",
-	"metadata":      "Standard object's metadata.",
 	"type":          "Required: Describes a type of stored blob.",
 	"content":       "Required: An opaque binary string which is an image's signature.",
 	"conditions":    "Conditions represent the latest available observations of a signature's current state.",
@@ -135,10 +132,9 @@ func (ImageSignature) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStream = map[string]string{
-	"":         "ImageStream stores a mapping of tags to images, metadata overrides that are applied when images are tagged in a stream, and an optional reference to a container image repository on a registry.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec describes the desired state of this stream",
-	"status":   "Status describes the current state of this stream",
+	"":       "ImageStream stores a mapping of tags to images, metadata overrides that are applied when images are tagged in a stream, and an optional reference to a container image repository on a registry.",
+	"spec":   "Spec describes the desired state of this stream",
+	"status": "Status describes the current state of this stream",
 }
 
 func (ImageStream) SwaggerDoc() map[string]string {
@@ -146,9 +142,8 @@ func (ImageStream) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStreamImage = map[string]string{
-	"":         "ImageStreamImage represents an Image that is retrieved by image name from an ImageStream.",
-	"metadata": "Standard object's metadata.",
-	"image":    "Image associated with the ImageStream and image name.",
+	"":      "ImageStreamImage represents an Image that is retrieved by image name from an ImageStream.",
+	"image": "Image associated with the ImageStream and image name.",
 }
 
 func (ImageStreamImage) SwaggerDoc() map[string]string {
@@ -156,10 +151,9 @@ func (ImageStreamImage) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStreamImport = map[string]string{
-	"":         "The image stream import resource provides an easy way for a user to find and import container images from other container image registries into the server. Individual images or an entire image repository may be imported, and users may choose to see the results of the import prior to tagging the resulting images into the specified image stream.\n\nThis API is intended for end-user tools that need to see the metadata of the image prior to import (for instance, to generate an application from it). Clients that know the desired image can continue to create spec.tags directly into their image streams.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec is a description of the images that the user wishes to import",
-	"status":   "Status is the the result of importing the image",
+	"":       "The image stream import resource provides an easy way for a user to find and import container images from other container image registries into the server. Individual images or an entire image repository may be imported, and users may choose to see the results of the import prior to tagging the resulting images into the specified image stream.\n\nThis API is intended for end-user tools that need to see the metadata of the image prior to import (for instance, to generate an application from it). Clients that know the desired image can continue to create spec.tags directly into their image streams.",
+	"spec":   "Spec is a description of the images that the user wishes to import",
+	"status": "Status is the the result of importing the image",
 }
 
 func (ImageStreamImport) SwaggerDoc() map[string]string {
@@ -189,10 +183,9 @@ func (ImageStreamImportStatus) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStreamLayers = map[string]string{
-	"":         "ImageStreamLayers describes information about the layers referenced by images in this image stream.",
-	"metadata": "Standard object's metadata.",
-	"blobs":    "blobs is a map of blob name to metadata about the blob.",
-	"images":   "images is a map between an image name and the names of the blobs and config that comprise the image.",
+	"":       "ImageStreamLayers describes information about the layers referenced by images in this image stream.",
+	"blobs":  "blobs is a map of blob name to metadata about the blob.",
+	"images": "images is a map between an image name and the names of the blobs and config that comprise the image.",
 }
 
 func (ImageStreamLayers) SwaggerDoc() map[string]string {
@@ -200,9 +193,8 @@ func (ImageStreamLayers) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStreamList = map[string]string{
-	"":         "ImageStreamList is a list of ImageStream objects.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of imageStreams",
+	"":      "ImageStreamList is a list of ImageStream objects.",
+	"items": "Items is a list of imageStreams",
 }
 
 func (ImageStreamList) SwaggerDoc() map[string]string {
@@ -210,10 +202,9 @@ func (ImageStreamList) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStreamMapping = map[string]string{
-	"":         "ImageStreamMapping represents a mapping from a single tag to a container image as well as the reference to the container image stream the image came from.",
-	"metadata": "Standard object's metadata.",
-	"image":    "Image is a container image.",
-	"tag":      "Tag is a string value this image can be located with inside the stream.",
+	"":      "ImageStreamMapping represents a mapping from a single tag to a container image as well as the reference to the container image stream the image came from.",
+	"image": "Image is a container image.",
+	"tag":   "Tag is a string value this image can be located with inside the stream.",
 }
 
 func (ImageStreamMapping) SwaggerDoc() map[string]string {
@@ -244,7 +235,6 @@ func (ImageStreamStatus) SwaggerDoc() map[string]string {
 
 var map_ImageStreamTag = map[string]string{
 	"":             "ImageStreamTag represents an Image that is retrieved by tag name from an ImageStream.",
-	"metadata":     "Standard object's metadata.",
 	"tag":          "tag is the spec tag associated with this image stream tag, and it may be null if only pushes have occurred to this image stream.",
 	"generation":   "generation is the current generation of the tagged image - if tag is provided and this value is not equal to the tag generation, a user has requested an import that has not completed, or conditions will be filled out indicating any error.",
 	"lookupPolicy": "lookupPolicy indicates whether this tag will handle image references in this namespace.",
@@ -257,9 +247,8 @@ func (ImageStreamTag) SwaggerDoc() map[string]string {
 }
 
 var map_ImageStreamTagList = map[string]string{
-	"":         "ImageStreamTagList is a list of ImageStreamTag objects.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of image stream tags",
+	"":      "ImageStreamTagList is a list of ImageStreamTag objects.",
+	"items": "Items is the list of image stream tags",
 }
 
 func (ImageStreamTagList) SwaggerDoc() map[string]string {
diff --git a/network/v1/generated.proto b/network/v1/generated.proto
index 404a80e5fcc..62d0ace267b 100644
--- a/network/v1/generated.proto
+++ b/network/v1/generated.proto
@@ -15,7 +15,6 @@ option go_package = "v1";
 // named "default", which is created by the SDN network plugin based on the master configuration
 // when the cluster is brought up for the first time.
 message ClusterNetwork {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Network is a CIDR string specifying the global overlay network's L3 space
@@ -51,7 +50,6 @@ message ClusterNetworkEntry {
 
 // ClusterNetworkList is a collection of ClusterNetworks
 message ClusterNetworkList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of cluster networks
@@ -64,7 +62,6 @@ message ClusterNetworkList {
 // namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy
 // is present) then the traffic will be allowed by default.
 message EgressNetworkPolicy {
-  // metadata for EgressNetworkPolicy
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // spec is the specification of the current egress network policy
@@ -73,7 +70,6 @@ message EgressNetworkPolicy {
 
 // EgressNetworkPolicyList is a collection of EgressNetworkPolicy
 message EgressNetworkPolicyList {
-  // metadata for EgressNetworkPolicyList
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // items is the list of policies
@@ -107,7 +103,6 @@ message EgressNetworkPolicySpec {
 // HostSubnet describes the container subnet network on a node. The HostSubnet object must have the
 // same name as the Node object it corresponds to.
 message HostSubnet {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Host is the name of the node. (This is the same as the object's name, but both fields must be set.)
@@ -134,7 +129,6 @@ message HostSubnet {
 
 // HostSubnetList is a collection of HostSubnets
 message HostSubnetList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of host subnets
@@ -145,7 +139,6 @@ message HostSubnetList {
 // plugin, every Namespace will have a corresponding NetNamespace object with the same name.
 // (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)
 message NetNamespace {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // NetName is the name of the network namespace. (This is the same as the object's name, but both fields must be set.)
@@ -161,7 +154,6 @@ message NetNamespace {
 
 // NetNamespaceList is a collection of NetNamespaces
 message NetNamespaceList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of net namespaces
diff --git a/network/v1/types.go b/network/v1/types.go
index a5ea4f6be73..b8c6c5b53bf 100644
--- a/network/v1/types.go
+++ b/network/v1/types.go
@@ -16,8 +16,7 @@ const (
 // named "default", which is created by the SDN network plugin based on the master configuration
 // when the cluster is brought up for the first time.
 type ClusterNetwork struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Network is a CIDR string specifying the global overlay network's L3 space
@@ -49,8 +48,8 @@ type ClusterNetworkEntry struct {
 // ClusterNetworkList is a collection of ClusterNetworks
 type ClusterNetworkList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of cluster networks
 	Items []ClusterNetwork `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -62,8 +61,7 @@ type ClusterNetworkList struct {
 // HostSubnet describes the container subnet network on a node. The HostSubnet object must have the
 // same name as the Node object it corresponds to.
 type HostSubnet struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Host is the name of the node. (This is the same as the object's name, but both fields must be set.)
@@ -90,8 +88,8 @@ type HostSubnet struct {
 // HostSubnetList is a collection of HostSubnets
 type HostSubnetList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of host subnets
 	Items []HostSubnet `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -104,8 +102,7 @@ type HostSubnetList struct {
 // plugin, every Namespace will have a corresponding NetNamespace object with the same name.
 // (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)
 type NetNamespace struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// NetName is the name of the network namespace. (This is the same as the object's name, but both fields must be set.)
@@ -123,8 +120,8 @@ type NetNamespace struct {
 // NetNamespaceList is a collection of NetNamespaces
 type NetNamespaceList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of net namespaces
 	Items []NetNamespace `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -168,8 +165,7 @@ type EgressNetworkPolicySpec struct {
 // namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy
 // is present) then the traffic will be allowed by default.
 type EgressNetworkPolicy struct {
-	metav1.TypeMeta `json:",inline"`
-	// metadata for EgressNetworkPolicy
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// spec is the specification of the current egress network policy
@@ -181,8 +177,8 @@ type EgressNetworkPolicy struct {
 // EgressNetworkPolicyList is a collection of EgressNetworkPolicy
 type EgressNetworkPolicyList struct {
 	metav1.TypeMeta `json:",inline"`
-	// metadata for EgressNetworkPolicyList
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// items is the list of policies
 	Items []EgressNetworkPolicy `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
diff --git a/network/v1/zz_generated.swagger_doc_generated.go b/network/v1/zz_generated.swagger_doc_generated.go
index f70cbdc3fde..9a4b3a5baee 100644
--- a/network/v1/zz_generated.swagger_doc_generated.go
+++ b/network/v1/zz_generated.swagger_doc_generated.go
@@ -13,7 +13,6 @@ package v1
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_ClusterNetwork = map[string]string{
 	"":                 "ClusterNetwork describes the cluster network. There is normally only one object of this type, named \"default\", which is created by the SDN network plugin based on the master configuration when the cluster is brought up for the first time.",
-	"metadata":         "Standard object's metadata.",
 	"network":          "Network is a CIDR string specifying the global overlay network's L3 space",
 	"hostsubnetlength": "HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods",
 	"serviceNetwork":   "ServiceNetwork is the CIDR range that Service IP addresses are allocated from",
@@ -38,9 +37,8 @@ func (ClusterNetworkEntry) SwaggerDoc() map[string]string {
 }
 
 var map_ClusterNetworkList = map[string]string{
-	"":         "ClusterNetworkList is a collection of ClusterNetworks",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of cluster networks",
+	"":      "ClusterNetworkList is a collection of ClusterNetworks",
+	"items": "Items is the list of cluster networks",
 }
 
 func (ClusterNetworkList) SwaggerDoc() map[string]string {
@@ -48,9 +46,8 @@ func (ClusterNetworkList) SwaggerDoc() map[string]string {
 }
 
 var map_EgressNetworkPolicy = map[string]string{
-	"":         "EgressNetworkPolicy describes the current egress network policy for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy is present) then the traffic will be allowed by default.",
-	"metadata": "metadata for EgressNetworkPolicy",
-	"spec":     "spec is the specification of the current egress network policy",
+	"":     "EgressNetworkPolicy describes the current egress network policy for a Namespace. When using the 'redhat/openshift-ovs-multitenant' network plugin, traffic from a pod to an IP address outside the cluster will be checked against each EgressNetworkPolicyRule in the pod's namespace's EgressNetworkPolicy, in order. If no rule matches (or no EgressNetworkPolicy is present) then the traffic will be allowed by default.",
+	"spec": "spec is the specification of the current egress network policy",
 }
 
 func (EgressNetworkPolicy) SwaggerDoc() map[string]string {
@@ -58,9 +55,8 @@ func (EgressNetworkPolicy) SwaggerDoc() map[string]string {
 }
 
 var map_EgressNetworkPolicyList = map[string]string{
-	"":         "EgressNetworkPolicyList is a collection of EgressNetworkPolicy",
-	"metadata": "metadata for EgressNetworkPolicyList",
-	"items":    "items is the list of policies",
+	"":      "EgressNetworkPolicyList is a collection of EgressNetworkPolicy",
+	"items": "items is the list of policies",
 }
 
 func (EgressNetworkPolicyList) SwaggerDoc() map[string]string {
@@ -98,7 +94,6 @@ func (EgressNetworkPolicySpec) SwaggerDoc() map[string]string {
 
 var map_HostSubnet = map[string]string{
 	"":            "HostSubnet describes the container subnet network on a node. The HostSubnet object must have the same name as the Node object it corresponds to.",
-	"metadata":    "Standard object's metadata.",
 	"host":        "Host is the name of the node. (This is the same as the object's name, but both fields must be set.)",
 	"hostIP":      "HostIP is the IP address to be used as a VTEP by other nodes in the overlay network",
 	"subnet":      "Subnet is the CIDR range of the overlay network assigned to the node for its pods",
@@ -111,9 +106,8 @@ func (HostSubnet) SwaggerDoc() map[string]string {
 }
 
 var map_HostSubnetList = map[string]string{
-	"":         "HostSubnetList is a collection of HostSubnets",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of host subnets",
+	"":      "HostSubnetList is a collection of HostSubnets",
+	"items": "Items is the list of host subnets",
 }
 
 func (HostSubnetList) SwaggerDoc() map[string]string {
@@ -122,7 +116,6 @@ func (HostSubnetList) SwaggerDoc() map[string]string {
 
 var map_NetNamespace = map[string]string{
 	"":          "NetNamespace describes a single isolated network. When using the redhat/openshift-ovs-multitenant plugin, every Namespace will have a corresponding NetNamespace object with the same name. (When using redhat/openshift-ovs-subnet, NetNamespaces are not used.)",
-	"metadata":  "Standard object's metadata.",
 	"netname":   "NetName is the name of the network namespace. (This is the same as the object's name, but both fields must be set.)",
 	"netid":     "NetID is the network identifier of the network namespace assigned to each overlay network packet. This can be manipulated with the \"oc adm pod-network\" commands.",
 	"egressIPs": "EgressIPs is a list of reserved IPs that will be used as the source for external traffic coming from pods in this namespace. (If empty, external traffic will be masqueraded to Node IPs.)",
@@ -133,9 +126,8 @@ func (NetNamespace) SwaggerDoc() map[string]string {
 }
 
 var map_NetNamespaceList = map[string]string{
-	"":         "NetNamespaceList is a collection of NetNamespaces",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of net namespaces",
+	"":      "NetNamespaceList is a collection of NetNamespaces",
+	"items": "Items is the list of net namespaces",
 }
 
 func (NetNamespaceList) SwaggerDoc() map[string]string {
diff --git a/oauth/v1/generated.proto b/oauth/v1/generated.proto
index 4ffad7b811d..e7a8c5c1e7d 100644
--- a/oauth/v1/generated.proto
+++ b/oauth/v1/generated.proto
@@ -25,7 +25,6 @@ message ClusterRoleScopeRestriction {
 
 // OAuthAccessToken describes an OAuth access token
 message OAuthAccessToken {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // ClientName references the client that created this token.
@@ -60,7 +59,6 @@ message OAuthAccessToken {
 
 // OAuthAccessTokenList is a collection of OAuth access tokens
 message OAuthAccessTokenList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of OAuth access tokens
@@ -69,7 +67,6 @@ message OAuthAccessTokenList {
 
 // OAuthAuthorizeToken describes an OAuth authorization token
 message OAuthAuthorizeToken {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // ClientName references the client that created this token.
@@ -103,7 +100,6 @@ message OAuthAuthorizeToken {
 
 // OAuthAuthorizeTokenList is a collection of OAuth authorization tokens
 message OAuthAuthorizeTokenList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of OAuth authorization tokens
@@ -112,7 +108,6 @@ message OAuthAuthorizeTokenList {
 
 // OAuthClient describes an OAuth client
 message OAuthClient {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Secret is the unique secret associated with a client
@@ -160,7 +155,6 @@ message OAuthClient {
 
 // OAuthClientAuthorization describes an authorization created by an OAuth client
 message OAuthClientAuthorization {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // ClientName references the client that created this authorization
@@ -179,7 +173,6 @@ message OAuthClientAuthorization {
 
 // OAuthClientAuthorizationList is a collection of OAuth client authorizations
 message OAuthClientAuthorizationList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of OAuth client authorizations
@@ -188,7 +181,6 @@ message OAuthClientAuthorizationList {
 
 // OAuthClientList is a collection of OAuth clients
 message OAuthClientList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of OAuth clients
@@ -197,7 +189,6 @@ message OAuthClientList {
 
 // OAuthRedirectReference is a reference to an OAuth redirect object.
 message OAuthRedirectReference {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // The reference to an redirect object in the current namespace.
diff --git a/oauth/v1/types.go b/oauth/v1/types.go
index e62dbb4529a..64bc1730470 100644
--- a/oauth/v1/types.go
+++ b/oauth/v1/types.go
@@ -10,8 +10,7 @@ import (
 
 // OAuthAccessToken describes an OAuth access token
 type OAuthAccessToken struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// ClientName references the client that created this token.
@@ -50,8 +49,7 @@ type OAuthAccessToken struct {
 
 // OAuthAuthorizeToken describes an OAuth authorization token
 type OAuthAuthorizeToken struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// ClientName references the client that created this token.
@@ -89,8 +87,7 @@ type OAuthAuthorizeToken struct {
 
 // OAuthClient describes an OAuth client
 type OAuthClient struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Secret is the unique secret associated with a client
@@ -172,8 +169,7 @@ type ClusterRoleScopeRestriction struct {
 
 // OAuthClientAuthorization describes an authorization created by an OAuth client
 type OAuthClientAuthorization struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// ClientName references the client that created this authorization
@@ -195,8 +191,8 @@ type OAuthClientAuthorization struct {
 // OAuthAccessTokenList is a collection of OAuth access tokens
 type OAuthAccessTokenList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of OAuth access tokens
 	Items []OAuthAccessToken `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -206,8 +202,8 @@ type OAuthAccessTokenList struct {
 // OAuthAuthorizeTokenList is a collection of OAuth authorization tokens
 type OAuthAuthorizeTokenList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of OAuth authorization tokens
 	Items []OAuthAuthorizeToken `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -217,8 +213,8 @@ type OAuthAuthorizeTokenList struct {
 // OAuthClientList is a collection of OAuth clients
 type OAuthClientList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of OAuth clients
 	Items []OAuthClient `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -228,8 +224,8 @@ type OAuthClientList struct {
 // OAuthClientAuthorizationList is a collection of OAuth client authorizations
 type OAuthClientAuthorizationList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of OAuth client authorizations
 	Items []OAuthClientAuthorization `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -238,9 +234,9 @@ type OAuthClientAuthorizationList struct {
 
 // OAuthRedirectReference is a reference to an OAuth redirect object.
 type OAuthRedirectReference struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// The reference to an redirect object in the current namespace.
 	Reference RedirectReference `json:"reference,omitempty" protobuf:"bytes,2,opt,name=reference"`
 }
diff --git a/oauth/v1/zz_generated.swagger_doc_generated.go b/oauth/v1/zz_generated.swagger_doc_generated.go
index 5f7804b8eba..84ddf18ecd9 100644
--- a/oauth/v1/zz_generated.swagger_doc_generated.go
+++ b/oauth/v1/zz_generated.swagger_doc_generated.go
@@ -24,7 +24,6 @@ func (ClusterRoleScopeRestriction) SwaggerDoc() map[string]string {
 
 var map_OAuthAccessToken = map[string]string{
 	"":                         "OAuthAccessToken describes an OAuth access token",
-	"metadata":                 "Standard object's metadata.",
 	"clientName":               "ClientName references the client that created this token.",
 	"expiresIn":                "ExpiresIn is the seconds from CreationTime before this token expires.",
 	"scopes":                   "Scopes is an array of the requested scopes.",
@@ -41,9 +40,8 @@ func (OAuthAccessToken) SwaggerDoc() map[string]string {
 }
 
 var map_OAuthAccessTokenList = map[string]string{
-	"":         "OAuthAccessTokenList is a collection of OAuth access tokens",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of OAuth access tokens",
+	"":      "OAuthAccessTokenList is a collection of OAuth access tokens",
+	"items": "Items is the list of OAuth access tokens",
 }
 
 func (OAuthAccessTokenList) SwaggerDoc() map[string]string {
@@ -52,7 +50,6 @@ func (OAuthAccessTokenList) SwaggerDoc() map[string]string {
 
 var map_OAuthAuthorizeToken = map[string]string{
 	"":                    "OAuthAuthorizeToken describes an OAuth authorization token",
-	"metadata":            "Standard object's metadata.",
 	"clientName":          "ClientName references the client that created this token.",
 	"expiresIn":           "ExpiresIn is the seconds from CreationTime before this token expires.",
 	"scopes":              "Scopes is an array of the requested scopes.",
@@ -69,9 +66,8 @@ func (OAuthAuthorizeToken) SwaggerDoc() map[string]string {
 }
 
 var map_OAuthAuthorizeTokenList = map[string]string{
-	"":         "OAuthAuthorizeTokenList is a collection of OAuth authorization tokens",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of OAuth authorization tokens",
+	"":      "OAuthAuthorizeTokenList is a collection of OAuth authorization tokens",
+	"items": "Items is the list of OAuth authorization tokens",
 }
 
 func (OAuthAuthorizeTokenList) SwaggerDoc() map[string]string {
@@ -80,7 +76,6 @@ func (OAuthAuthorizeTokenList) SwaggerDoc() map[string]string {
 
 var map_OAuthClient = map[string]string{
 	"":                                    "OAuthClient describes an OAuth client",
-	"metadata":                            "Standard object's metadata.",
 	"secret":                              "Secret is the unique secret associated with a client",
 	"additionalSecrets":                   "AdditionalSecrets holds other secrets that may be used to identify the client.  This is useful for rotation and for service account token validation",
 	"respondWithChallenges":               "RespondWithChallenges indicates whether the client wants authentication needed responses made in the form of challenges instead of redirects",
@@ -97,7 +92,6 @@ func (OAuthClient) SwaggerDoc() map[string]string {
 
 var map_OAuthClientAuthorization = map[string]string{
 	"":           "OAuthClientAuthorization describes an authorization created by an OAuth client",
-	"metadata":   "Standard object's metadata.",
 	"clientName": "ClientName references the client that created this authorization",
 	"userName":   "UserName is the user name that authorized this client",
 	"userUID":    "UserUID is the unique UID associated with this authorization. UserUID and UserName must both match for this authorization to be valid.",
@@ -109,9 +103,8 @@ func (OAuthClientAuthorization) SwaggerDoc() map[string]string {
 }
 
 var map_OAuthClientAuthorizationList = map[string]string{
-	"":         "OAuthClientAuthorizationList is a collection of OAuth client authorizations",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of OAuth client authorizations",
+	"":      "OAuthClientAuthorizationList is a collection of OAuth client authorizations",
+	"items": "Items is the list of OAuth client authorizations",
 }
 
 func (OAuthClientAuthorizationList) SwaggerDoc() map[string]string {
@@ -119,9 +112,8 @@ func (OAuthClientAuthorizationList) SwaggerDoc() map[string]string {
 }
 
 var map_OAuthClientList = map[string]string{
-	"":         "OAuthClientList is a collection of OAuth clients",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of OAuth clients",
+	"":      "OAuthClientList is a collection of OAuth clients",
+	"items": "Items is the list of OAuth clients",
 }
 
 func (OAuthClientList) SwaggerDoc() map[string]string {
@@ -130,7 +122,6 @@ func (OAuthClientList) SwaggerDoc() map[string]string {
 
 var map_OAuthRedirectReference = map[string]string{
 	"":          "OAuthRedirectReference is a reference to an OAuth redirect object.",
-	"metadata":  "Standard object's metadata.",
 	"reference": "The reference to an redirect object in the current namespace.",
 }
 
diff --git a/operator/v1/types.go b/operator/v1/types.go
index 179c476c63a..351e35ab47c 100644
--- a/operator/v1/types.go
+++ b/operator/v1/types.go
@@ -24,7 +24,7 @@ type MyOperatorResourceStatus struct {
 	OperatorStatus `json:",inline"`
 }
 
-// +kubebuilder:validation:Pattern=^(Managed|Unmanaged|Force|Removed)$
+// +kubebuilder:validation:Pattern=`^(Managed|Unmanaged|Force|Removed)$`
 type ManagementState string
 
 var (
@@ -66,12 +66,14 @@ type OperatorSpec struct {
 	// 3. unsupportedConfigOverrides
 	// +optional
 	// +nullable
+	// +kubebuilder:validation:PreserveUnknownFields
 	UnsupportedConfigOverrides runtime.RawExtension `json:"unsupportedConfigOverrides"`
 
 	// observedConfig holds a sparse config that controller has observed from the cluster state.  It exists in spec because
 	// it is an input to the level for the operator
 	// +optional
 	// +nullable
+	// +kubebuilder:validation:PreserveUnknownFields
 	ObservedConfig runtime.RawExtension `json:"observedConfig"`
 }
 
diff --git a/operator/v1/types_etcd.go b/operator/v1/types_etcd.go
index ad75154bd3c..6a2fbdb9acf 100644
--- a/operator/v1/types_etcd.go
+++ b/operator/v1/types_etcd.go
@@ -33,8 +33,8 @@ type EtcdStatus struct {
 // KubeAPISOperatorConfigList is a collection of items
 type EtcdList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []Etcd `json:"items"`
 }
diff --git a/operator/v1/types_kubeapiserver.go b/operator/v1/types_kubeapiserver.go
index 71292438fbd..d2c4ae04d75 100644
--- a/operator/v1/types_kubeapiserver.go
+++ b/operator/v1/types_kubeapiserver.go
@@ -33,8 +33,8 @@ type KubeAPIServerStatus struct {
 // KubeAPIServerList is a collection of items
 type KubeAPIServerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []KubeAPIServer `json:"items"`
 }
diff --git a/operator/v1/types_kubecontrollermanager.go b/operator/v1/types_kubecontrollermanager.go
index 664b3b6d7fb..ee5c66cadb6 100644
--- a/operator/v1/types_kubecontrollermanager.go
+++ b/operator/v1/types_kubecontrollermanager.go
@@ -33,8 +33,8 @@ type KubeControllerManagerStatus struct {
 // KubeControllerManagerList is a collection of items
 type KubeControllerManagerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []KubeControllerManager `json:"items"`
 }
diff --git a/operator/v1/types_kubestorageversionmigrator.go b/operator/v1/types_kubestorageversionmigrator.go
index 2160813c3e6..5949ac021a7 100644
--- a/operator/v1/types_kubestorageversionmigrator.go
+++ b/operator/v1/types_kubestorageversionmigrator.go
@@ -33,8 +33,8 @@ type KubeStorageVersionMigratorStatus struct {
 // KubeStorageVersionMigratorList is a collection of items
 type KubeStorageVersionMigratorList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []KubeStorageVersionMigrator `json:"items"`
 }
diff --git a/operator/v1/types_openshiftapiserver.go b/operator/v1/types_openshiftapiserver.go
index 63c552c7a82..16f9c3eedf8 100644
--- a/operator/v1/types_openshiftapiserver.go
+++ b/operator/v1/types_openshiftapiserver.go
@@ -33,8 +33,8 @@ type OpenShiftAPIServerStatus struct {
 // OpenShiftAPIServerList is a collection of items
 type OpenShiftAPIServerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []OpenShiftAPIServer `json:"items"`
 }
diff --git a/operator/v1/types_openshiftcontrollermanager.go b/operator/v1/types_openshiftcontrollermanager.go
index 0d3f1e5c34f..0f23b01be27 100644
--- a/operator/v1/types_openshiftcontrollermanager.go
+++ b/operator/v1/types_openshiftcontrollermanager.go
@@ -33,8 +33,8 @@ type OpenShiftControllerManagerStatus struct {
 // OpenShiftControllerManagerList is a collection of items
 type OpenShiftControllerManagerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []OpenShiftControllerManager `json:"items"`
 }
diff --git a/operator/v1/types_scheduler.go b/operator/v1/types_scheduler.go
index f9e4e74acac..20d5f759a56 100644
--- a/operator/v1/types_scheduler.go
+++ b/operator/v1/types_scheduler.go
@@ -33,8 +33,8 @@ type KubeSchedulerStatus struct {
 // KubeSchedulerList is a collection of items
 type KubeSchedulerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []KubeScheduler `json:"items"`
 }
diff --git a/operator/v1/types_serviceca.go b/operator/v1/types_serviceca.go
index 3859d9d5e63..b8d5e2646a4 100644
--- a/operator/v1/types_serviceca.go
+++ b/operator/v1/types_serviceca.go
@@ -35,8 +35,8 @@ type ServiceCAStatus struct {
 // ServiceCAList is a collection of items
 type ServiceCAList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []ServiceCA `json:"items"`
 }
diff --git a/operator/v1/types_servicecatalogapiserver.go b/operator/v1/types_servicecatalogapiserver.go
index 5526b66f5bc..7c1a857bb61 100644
--- a/operator/v1/types_servicecatalogapiserver.go
+++ b/operator/v1/types_servicecatalogapiserver.go
@@ -33,8 +33,8 @@ type ServiceCatalogAPIServerStatus struct {
 // ServiceCatalogAPIServerList is a collection of items
 type ServiceCatalogAPIServerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []ServiceCatalogAPIServer `json:"items"`
 }
diff --git a/operator/v1/types_servicecatalogcontrollermanager.go b/operator/v1/types_servicecatalogcontrollermanager.go
index 4378c0a3f17..ac3bf5898c8 100644
--- a/operator/v1/types_servicecatalogcontrollermanager.go
+++ b/operator/v1/types_servicecatalogcontrollermanager.go
@@ -33,8 +33,8 @@ type ServiceCatalogControllerManagerStatus struct {
 // ServiceCatalogControllerManagerList is a collection of items
 type ServiceCatalogControllerManagerList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
+
 	// Items contains the items
 	Items []ServiceCatalogControllerManager `json:"items"`
 }
diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go
index a6bfdd90141..be823743fe8 100644
--- a/operator/v1/zz_generated.swagger_doc_generated.go
+++ b/operator/v1/zz_generated.swagger_doc_generated.go
@@ -219,9 +219,8 @@ func (Etcd) SwaggerDoc() map[string]string {
 }
 
 var map_EtcdList = map[string]string{
-	"":         "KubeAPISOperatorConfigList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "KubeAPISOperatorConfigList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (EtcdList) SwaggerDoc() map[string]string {
@@ -333,9 +332,8 @@ func (KubeAPIServer) SwaggerDoc() map[string]string {
 }
 
 var map_KubeAPIServerList = map[string]string{
-	"":         "KubeAPIServerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "KubeAPIServerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (KubeAPIServerList) SwaggerDoc() map[string]string {
@@ -351,9 +349,8 @@ func (KubeControllerManager) SwaggerDoc() map[string]string {
 }
 
 var map_KubeControllerManagerList = map[string]string{
-	"":         "KubeControllerManagerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "KubeControllerManagerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (KubeControllerManagerList) SwaggerDoc() map[string]string {
@@ -369,9 +366,8 @@ func (KubeStorageVersionMigrator) SwaggerDoc() map[string]string {
 }
 
 var map_KubeStorageVersionMigratorList = map[string]string{
-	"":         "KubeStorageVersionMigratorList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "KubeStorageVersionMigratorList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (KubeStorageVersionMigratorList) SwaggerDoc() map[string]string {
@@ -568,9 +564,8 @@ func (OpenShiftAPIServer) SwaggerDoc() map[string]string {
 }
 
 var map_OpenShiftAPIServerList = map[string]string{
-	"":         "OpenShiftAPIServerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "OpenShiftAPIServerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (OpenShiftAPIServerList) SwaggerDoc() map[string]string {
@@ -586,9 +581,8 @@ func (OpenShiftControllerManager) SwaggerDoc() map[string]string {
 }
 
 var map_OpenShiftControllerManagerList = map[string]string{
-	"":         "OpenShiftControllerManagerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "OpenShiftControllerManagerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (OpenShiftControllerManagerList) SwaggerDoc() map[string]string {
@@ -604,9 +598,8 @@ func (KubeScheduler) SwaggerDoc() map[string]string {
 }
 
 var map_KubeSchedulerList = map[string]string{
-	"":         "KubeSchedulerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "KubeSchedulerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (KubeSchedulerList) SwaggerDoc() map[string]string {
@@ -624,9 +617,8 @@ func (ServiceCA) SwaggerDoc() map[string]string {
 }
 
 var map_ServiceCAList = map[string]string{
-	"":         "ServiceCAList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "ServiceCAList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (ServiceCAList) SwaggerDoc() map[string]string {
@@ -642,9 +634,8 @@ func (ServiceCatalogAPIServer) SwaggerDoc() map[string]string {
 }
 
 var map_ServiceCatalogAPIServerList = map[string]string{
-	"":         "ServiceCatalogAPIServerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "ServiceCatalogAPIServerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (ServiceCatalogAPIServerList) SwaggerDoc() map[string]string {
@@ -660,9 +651,8 @@ func (ServiceCatalogControllerManager) SwaggerDoc() map[string]string {
 }
 
 var map_ServiceCatalogControllerManagerList = map[string]string{
-	"":         "ServiceCatalogControllerManagerList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "ServiceCatalogControllerManagerList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (ServiceCatalogControllerManagerList) SwaggerDoc() map[string]string {
diff --git a/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml b/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
index d43fddef306..2c70eaa4f12 100644
--- a/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
+++ b/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   group: operator.openshift.io
   scope: Cluster
+  preserveUnknownField: false
   names:
     kind: ImageContentSourcePolicy
     singular: imagecontentsourcepolicy
@@ -36,7 +37,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: spec holds user settable values for configuration
diff --git a/operator/v1alpha1/types_image_content_source_policy.go b/operator/v1alpha1/types_image_content_source_policy.go
index db5ec6ab159..49f8b952226 100644
--- a/operator/v1alpha1/types_image_content_source_policy.go
+++ b/operator/v1alpha1/types_image_content_source_policy.go
@@ -9,8 +9,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // ImageContentSourcePolicy holds cluster-wide information about how to handle registry mirror rules.
 // When multiple policies are defined, the outcome of the behavior is defined on each field.
 type ImageContentSourcePolicy struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -46,9 +45,9 @@ type ImageContentSourcePolicySpec struct {
 // ImageContentSourcePolicyList lists the items in the ImageContentSourcePolicy CRD.
 type ImageContentSourcePolicyList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []ImageContentSourcePolicy `json:"items"`
+
+	Items []ImageContentSourcePolicy `json:"items"`
 }
 
 // RepositoryDigestMirrors holds cluster-wide information about how to handle mirros in the registries config.
diff --git a/operator/v1alpha1/zz_generated.swagger_doc_generated.go b/operator/v1alpha1/zz_generated.swagger_doc_generated.go
index 84d04215c76..5a32df8389f 100644
--- a/operator/v1alpha1/zz_generated.swagger_doc_generated.go
+++ b/operator/v1alpha1/zz_generated.swagger_doc_generated.go
@@ -136,9 +136,8 @@ func (VersionAvailability) SwaggerDoc() map[string]string {
 }
 
 var map_ImageContentSourcePolicy = map[string]string{
-	"":         "ImageContentSourcePolicy holds cluster-wide information about how to handle registry mirror rules. When multiple policies are defined, the outcome of the behavior is defined on each field.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "spec holds user settable values for configuration",
+	"":     "ImageContentSourcePolicy holds cluster-wide information about how to handle registry mirror rules. When multiple policies are defined, the outcome of the behavior is defined on each field.",
+	"spec": "spec holds user settable values for configuration",
 }
 
 func (ImageContentSourcePolicy) SwaggerDoc() map[string]string {
@@ -146,8 +145,7 @@ func (ImageContentSourcePolicy) SwaggerDoc() map[string]string {
 }
 
 var map_ImageContentSourcePolicyList = map[string]string{
-	"":         "ImageContentSourcePolicyList lists the items in the ImageContentSourcePolicy CRD.",
-	"metadata": "Standard object's metadata.",
+	"": "ImageContentSourcePolicyList lists the items in the ImageContentSourcePolicy CRD.",
 }
 
 func (ImageContentSourcePolicyList) SwaggerDoc() map[string]string {
diff --git a/osin/v1/types.go b/osin/v1/types.go
index e7d4f164c2d..66f58b9e0cf 100644
--- a/osin/v1/types.go
+++ b/osin/v1/types.go
@@ -105,6 +105,7 @@ type IdentityProvider struct {
 	// mappingMethod determines how identities from this provider are mapped to users
 	MappingMethod string `json:"mappingMethod"`
 	// provider contains the information about how to set up a specific identity provider
+	// +kubebuilder:validation:PreserveUnknownFields
 	Provider runtime.RawExtension `json:"provider"`
 }
 
diff --git a/project/v1/generated.proto b/project/v1/generated.proto
index dec0f1e4b47..9624c47afbc 100644
--- a/project/v1/generated.proto
+++ b/project/v1/generated.proto
@@ -25,7 +25,6 @@ option go_package = "v1";
 // as editable to end users while namespaces are not. Direct creation of a project is typically restricted
 // to administrators, while end users should use the requestproject resource.
 message Project {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec defines the behavior of the Namespace.
@@ -37,7 +36,6 @@ message Project {
 
 // ProjectList is a list of Project objects.
 message ProjectList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of projects
@@ -46,7 +44,6 @@ message ProjectList {
 
 // ProjecRequest is the set of options necessary to fully qualify a project request
 message ProjectRequest {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // DisplayName is the display name to apply to a project
diff --git a/project/v1/types.go b/project/v1/types.go
index 51829507af6..1c18dc5ef71 100644
--- a/project/v1/types.go
+++ b/project/v1/types.go
@@ -10,8 +10,8 @@ import (
 // ProjectList is a list of Project objects.
 type ProjectList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of projects
 	Items []Project `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -64,8 +64,7 @@ type ProjectStatus struct {
 // as editable to end users while namespaces are not. Direct creation of a project is typically restricted
 // to administrators, while end users should use the requestproject resource.
 type Project struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec defines the behavior of the Namespace.
@@ -83,9 +82,9 @@ type Project struct {
 
 // ProjecRequest is the set of options necessary to fully qualify a project request
 type ProjectRequest struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// DisplayName is the display name to apply to a project
 	DisplayName string `json:"displayName,omitempty" protobuf:"bytes,2,opt,name=displayName"`
 	// Description is the description to apply to a project
diff --git a/project/v1/zz_generated.swagger_doc_generated.go b/project/v1/zz_generated.swagger_doc_generated.go
index 295892251a9..080f2677ae1 100644
--- a/project/v1/zz_generated.swagger_doc_generated.go
+++ b/project/v1/zz_generated.swagger_doc_generated.go
@@ -12,10 +12,9 @@ package v1
 
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_Project = map[string]string{
-	"":         "Projects are the unit of isolation and collaboration in OpenShift. A project has one or more members, a quota on the resources that the project may consume, and the security controls on the resources in the project. Within a project, members may have different roles - project administrators can set membership, editors can create and manage the resources, and viewers can see but not access running containers. In a normal cluster project administrators are not able to alter their quotas - that is restricted to cluster administrators.\n\nListing or watching projects will return only projects the user has the reader role on.\n\nAn OpenShift project is an alternative representation of a Kubernetes namespace. Projects are exposed as editable to end users while namespaces are not. Direct creation of a project is typically restricted to administrators, while end users should use the requestproject resource.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec defines the behavior of the Namespace.",
-	"status":   "Status describes the current status of a Namespace",
+	"":       "Projects are the unit of isolation and collaboration in OpenShift. A project has one or more members, a quota on the resources that the project may consume, and the security controls on the resources in the project. Within a project, members may have different roles - project administrators can set membership, editors can create and manage the resources, and viewers can see but not access running containers. In a normal cluster project administrators are not able to alter their quotas - that is restricted to cluster administrators.\n\nListing or watching projects will return only projects the user has the reader role on.\n\nAn OpenShift project is an alternative representation of a Kubernetes namespace. Projects are exposed as editable to end users while namespaces are not. Direct creation of a project is typically restricted to administrators, while end users should use the requestproject resource.",
+	"spec":   "Spec defines the behavior of the Namespace.",
+	"status": "Status describes the current status of a Namespace",
 }
 
 func (Project) SwaggerDoc() map[string]string {
@@ -23,9 +22,8 @@ func (Project) SwaggerDoc() map[string]string {
 }
 
 var map_ProjectList = map[string]string{
-	"":         "ProjectList is a list of Project objects.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of projects",
+	"":      "ProjectList is a list of Project objects.",
+	"items": "Items is the list of projects",
 }
 
 func (ProjectList) SwaggerDoc() map[string]string {
@@ -34,7 +32,6 @@ func (ProjectList) SwaggerDoc() map[string]string {
 
 var map_ProjectRequest = map[string]string{
 	"":            "ProjecRequest is the set of options necessary to fully qualify a project request",
-	"metadata":    "Standard object's metadata.",
 	"displayName": "DisplayName is the display name to apply to a project",
 	"description": "Description is the description to apply to a project",
 }
diff --git a/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml b/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
index 31569c26a5e..d0e9e92b20b 100644
--- a/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
+++ b/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
@@ -9,6 +9,7 @@ spec:
     listKind: ClusterResourceQuotaList
     plural: clusterresourcequotas
     singular: clusterresourcequota
+  preserveUnknownField: false
   scope: Cluster
   subresources:
     status: {}
@@ -29,7 +30,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: Standard object's metadata.
           type: object
         spec:
           description: Spec defines the desired quota
diff --git a/quota/v1/generated.proto b/quota/v1/generated.proto
index d651baf8a72..ba3fe4659d1 100644
--- a/quota/v1/generated.proto
+++ b/quota/v1/generated.proto
@@ -16,7 +16,6 @@ option go_package = "v1";
 // into a project.  It allows a project-admin to know which ClusterResourceQuotas are applied to
 // his project and their associated usage.
 message AppliedClusterResourceQuota {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec defines the desired quota
@@ -28,7 +27,6 @@ message AppliedClusterResourceQuota {
 
 // AppliedClusterResourceQuotaList is a collection of AppliedClusterResourceQuotas
 message AppliedClusterResourceQuotaList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of AppliedClusterResourceQuota
@@ -38,7 +36,6 @@ message AppliedClusterResourceQuotaList {
 // ClusterResourceQuota mirrors ResourceQuota at a cluster scope.  This object is easily convertible to
 // synthetic ResourceQuota object to allow quota evaluation re-use.
 message ClusterResourceQuota {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec defines the desired quota
@@ -50,7 +47,6 @@ message ClusterResourceQuota {
 
 // ClusterResourceQuotaList is a collection of ClusterResourceQuotas
 message ClusterResourceQuotaList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of ClusterResourceQuotas
diff --git a/quota/v1/types.go b/quota/v1/types.go
index e34e8151620..1bac842c7b5 100644
--- a/quota/v1/types.go
+++ b/quota/v1/types.go
@@ -12,8 +12,7 @@ import (
 // ClusterResourceQuota mirrors ResourceQuota at a cluster scope.  This object is easily convertible to
 // synthetic ResourceQuota object to allow quota evaluation re-use.
 type ClusterResourceQuota struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec defines the desired quota
@@ -68,7 +67,6 @@ type ClusterResourceQuotaStatus struct {
 // ClusterResourceQuotaList is a collection of ClusterResourceQuotas
 type ClusterResourceQuotaList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of ClusterResourceQuotas
@@ -95,8 +93,7 @@ type ResourceQuotaStatusByNamespace struct {
 // into a project.  It allows a project-admin to know which ClusterResourceQuotas are applied to
 // his project and their associated usage.
 type AppliedClusterResourceQuota struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Spec defines the desired quota
@@ -111,7 +108,6 @@ type AppliedClusterResourceQuota struct {
 // AppliedClusterResourceQuotaList is a collection of AppliedClusterResourceQuotas
 type AppliedClusterResourceQuotaList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of AppliedClusterResourceQuota
diff --git a/quota/v1/zz_generated.swagger_doc_generated.go b/quota/v1/zz_generated.swagger_doc_generated.go
index d93479721c5..71c0d6d56f8 100644
--- a/quota/v1/zz_generated.swagger_doc_generated.go
+++ b/quota/v1/zz_generated.swagger_doc_generated.go
@@ -12,10 +12,9 @@ package v1
 
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_AppliedClusterResourceQuota = map[string]string{
-	"":         "AppliedClusterResourceQuota mirrors ClusterResourceQuota at a project scope, for projection into a project.  It allows a project-admin to know which ClusterResourceQuotas are applied to his project and their associated usage.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec defines the desired quota",
-	"status":   "Status defines the actual enforced quota and its current usage",
+	"":       "AppliedClusterResourceQuota mirrors ClusterResourceQuota at a project scope, for projection into a project.  It allows a project-admin to know which ClusterResourceQuotas are applied to his project and their associated usage.",
+	"spec":   "Spec defines the desired quota",
+	"status": "Status defines the actual enforced quota and its current usage",
 }
 
 func (AppliedClusterResourceQuota) SwaggerDoc() map[string]string {
@@ -23,9 +22,8 @@ func (AppliedClusterResourceQuota) SwaggerDoc() map[string]string {
 }
 
 var map_AppliedClusterResourceQuotaList = map[string]string{
-	"":         "AppliedClusterResourceQuotaList is a collection of AppliedClusterResourceQuotas",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of AppliedClusterResourceQuota",
+	"":      "AppliedClusterResourceQuotaList is a collection of AppliedClusterResourceQuotas",
+	"items": "Items is a list of AppliedClusterResourceQuota",
 }
 
 func (AppliedClusterResourceQuotaList) SwaggerDoc() map[string]string {
@@ -33,10 +31,9 @@ func (AppliedClusterResourceQuotaList) SwaggerDoc() map[string]string {
 }
 
 var map_ClusterResourceQuota = map[string]string{
-	"":         "ClusterResourceQuota mirrors ResourceQuota at a cluster scope.  This object is easily convertible to synthetic ResourceQuota object to allow quota evaluation re-use.",
-	"metadata": "Standard object's metadata.",
-	"spec":     "Spec defines the desired quota",
-	"status":   "Status defines the actual enforced quota and its current usage",
+	"":       "ClusterResourceQuota mirrors ResourceQuota at a cluster scope.  This object is easily convertible to synthetic ResourceQuota object to allow quota evaluation re-use.",
+	"spec":   "Spec defines the desired quota",
+	"status": "Status defines the actual enforced quota and its current usage",
 }
 
 func (ClusterResourceQuota) SwaggerDoc() map[string]string {
@@ -44,9 +41,8 @@ func (ClusterResourceQuota) SwaggerDoc() map[string]string {
 }
 
 var map_ClusterResourceQuotaList = map[string]string{
-	"":         "ClusterResourceQuotaList is a collection of ClusterResourceQuotas",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of ClusterResourceQuotas",
+	"":      "ClusterResourceQuotaList is a collection of ClusterResourceQuotas",
+	"items": "Items is a list of ClusterResourceQuotas",
 }
 
 func (ClusterResourceQuotaList) SwaggerDoc() map[string]string {
diff --git a/route/v1/generated.proto b/route/v1/generated.proto
index d4dfcdd6283..5ede72545ec 100644
--- a/route/v1/generated.proto
+++ b/route/v1/generated.proto
@@ -31,7 +31,6 @@ option go_package = "v1";
 // If a client chooses a duplicate name, for instance, the route status conditions are used
 // to indicate the route cannot be chosen.
 message Route {
-  // Standard object metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // spec is the desired state of the route
@@ -84,7 +83,6 @@ message RouteIngressCondition {
 
 // RouteList is a collection of Routes.
 message RouteList {
-  // Standard object metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // items is a list of routes
diff --git a/route/v1/types.go b/route/v1/types.go
index 4ea1881950e..296b947abca 100644
--- a/route/v1/types.go
+++ b/route/v1/types.go
@@ -27,8 +27,7 @@ import (
 // If a client chooses a duplicate name, for instance, the route status conditions are used
 // to indicate the route cannot be chosen.
 type Route struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// spec is the desired state of the route
@@ -42,7 +41,6 @@ type Route struct {
 // RouteList is a collection of Routes.
 type RouteList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// items is a list of routes
diff --git a/route/v1/zz_generated.swagger_doc_generated.go b/route/v1/zz_generated.swagger_doc_generated.go
index d68df449816..c0fc24b6530 100644
--- a/route/v1/zz_generated.swagger_doc_generated.go
+++ b/route/v1/zz_generated.swagger_doc_generated.go
@@ -12,10 +12,9 @@ package v1
 
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_Route = map[string]string{
-	"":         "A route allows developers to expose services through an HTTP(S) aware load balancing and proxy layer via a public DNS entry. The route may further specify TLS options and a certificate, or specify a public CNAME that the router should also accept for HTTP and HTTPS traffic. An administrator typically configures their router to be visible outside the cluster firewall, and may also add additional security, caching, or traffic controls on the service content. Routers usually talk directly to the service endpoints.\n\nOnce a route is created, the `host` field may not be changed. Generally, routers use the oldest route with a given host when resolving conflicts.\n\nRouters are subject to additional customization and may support additional controls via the annotations field.\n\nBecause administrators may configure multiple routers, the route status field is used to return information to clients about the names and states of the route under each router. If a client chooses a duplicate name, for instance, the route status conditions are used to indicate the route cannot be chosen.",
-	"metadata": "Standard object metadata.",
-	"spec":     "spec is the desired state of the route",
-	"status":   "status is the current state of the route",
+	"":       "A route allows developers to expose services through an HTTP(S) aware load balancing and proxy layer via a public DNS entry. The route may further specify TLS options and a certificate, or specify a public CNAME that the router should also accept for HTTP and HTTPS traffic. An administrator typically configures their router to be visible outside the cluster firewall, and may also add additional security, caching, or traffic controls on the service content. Routers usually talk directly to the service endpoints.\n\nOnce a route is created, the `host` field may not be changed. Generally, routers use the oldest route with a given host when resolving conflicts.\n\nRouters are subject to additional customization and may support additional controls via the annotations field.\n\nBecause administrators may configure multiple routers, the route status field is used to return information to clients about the names and states of the route under each router. If a client chooses a duplicate name, for instance, the route status conditions are used to indicate the route cannot be chosen.",
+	"spec":   "spec is the desired state of the route",
+	"status": "status is the current state of the route",
 }
 
 func (Route) SwaggerDoc() map[string]string {
@@ -49,9 +48,8 @@ func (RouteIngressCondition) SwaggerDoc() map[string]string {
 }
 
 var map_RouteList = map[string]string{
-	"":         "RouteList is a collection of Routes.",
-	"metadata": "Standard object metadata.",
-	"items":    "items is a list of routes",
+	"":      "RouteList is a collection of Routes.",
+	"items": "items is a list of routes",
 }
 
 func (RouteList) SwaggerDoc() map[string]string {
diff --git a/security/v1/0000_03_security-openshift_01_scc.crd.yaml b/security/v1/0000_03_security-openshift_01_scc.crd.yaml
index 57a383945f8..025d9956126 100644
--- a/security/v1/0000_03_security-openshift_01_scc.crd.yaml
+++ b/security/v1/0000_03_security-openshift_01_scc.crd.yaml
@@ -10,6 +10,7 @@ spec:
     plural: securitycontextconstraints
     singular: securitycontextconstraints
   scope: Cluster
+  preserveUnknownField: false
   versions:
   - name: v1
     served: true
@@ -176,7 +177,6 @@ spec:
             submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
-          description: 'Standard object''s metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata'
           type: object
         priority:
           description: Priority influences the sort order of SCCs when evaluating
diff --git a/security/v1/generated.proto b/security/v1/generated.proto
index 0a16d746f53..7cbba8eac01 100644
--- a/security/v1/generated.proto
+++ b/security/v1/generated.proto
@@ -125,9 +125,6 @@ message PodSecurityPolicySubjectReviewStatus {
 
 // RangeAllocation is used so we can easily expose a RangeAllocation typed for security group
 message RangeAllocation {
-  // Standard object's metadata.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
-  // +optional
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // range is a string representing a unique label for a range of uids, "1000000000-2000000000/10000".
@@ -140,7 +137,6 @@ message RangeAllocation {
 
 // RangeAllocationList is a list of RangeAllocations objects
 message RangeAllocationList {
-  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // List of RangeAllocations.
@@ -180,8 +176,6 @@ message SELinuxContextStrategyOptions {
 // SecurityContextConstraints.
 // +kubebuilder:singular=securitycontextconstraint
 message SecurityContextConstraints {
-  // Standard object's metadata.
-  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Priority influences the sort order of SCCs when evaluating which SCCs to try first for
@@ -322,7 +316,6 @@ message SecurityContextConstraints {
 
 // SecurityContextConstraintsList is a list of SecurityContextConstraints objects
 message SecurityContextConstraintsList {
-  // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // List of security context constraints.
diff --git a/security/v1/types.go b/security/v1/types.go
index 2232a83dcb2..5796a5f4e98 100644
--- a/security/v1/types.go
+++ b/security/v1/types.go
@@ -22,9 +22,7 @@ var AllowAllCapabilities corev1.Capability = "*"
 // SecurityContextConstraints.
 // +kubebuilder:singular=securitycontextconstraint
 type SecurityContextConstraints struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
-	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Priority influences the sort order of SCCs when evaluating which SCCs to try first for
@@ -281,8 +279,6 @@ const (
 // SecurityContextConstraintsList is a list of SecurityContextConstraints objects
 type SecurityContextConstraintsList struct {
 	metav1.TypeMeta `json:",inline"`
-
-	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// List of security context constraints.
@@ -406,10 +402,7 @@ type ServiceAccountPodSecurityPolicyReviewStatus struct {
 
 // RangeAllocation is used so we can easily expose a RangeAllocation typed for security group
 type RangeAllocation struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
-	// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
-	// +optional
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// range is a string representing a unique label for a range of uids, "1000000000-2000000000/10000".
@@ -425,8 +418,6 @@ type RangeAllocation struct {
 // RangeAllocationList is a list of RangeAllocations objects
 type RangeAllocationList struct {
 	metav1.TypeMeta `json:",inline"`
-
-	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// List of RangeAllocations.
diff --git a/security/v1/zz_generated.swagger_doc_generated.go b/security/v1/zz_generated.swagger_doc_generated.go
index 60a167915ed..1077c04017b 100644
--- a/security/v1/zz_generated.swagger_doc_generated.go
+++ b/security/v1/zz_generated.swagger_doc_generated.go
@@ -121,10 +121,9 @@ func (PodSecurityPolicySubjectReviewStatus) SwaggerDoc() map[string]string {
 }
 
 var map_RangeAllocation = map[string]string{
-	"":         "RangeAllocation is used so we can easily expose a RangeAllocation typed for security group",
-	"metadata": "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
-	"range":    "range is a string representing a unique label for a range of uids, \"1000000000-2000000000/10000\".",
-	"data":     "data is a byte array representing the serialized state of a range allocation.  It is a bitmap with each bit set to one to represent a range is taken.",
+	"":      "RangeAllocation is used so we can easily expose a RangeAllocation typed for security group",
+	"range": "range is a string representing a unique label for a range of uids, \"1000000000-2000000000/10000\".",
+	"data":  "data is a byte array representing the serialized state of a range allocation.  It is a bitmap with each bit set to one to represent a range is taken.",
 }
 
 func (RangeAllocation) SwaggerDoc() map[string]string {
@@ -132,9 +131,8 @@ func (RangeAllocation) SwaggerDoc() map[string]string {
 }
 
 var map_RangeAllocationList = map[string]string{
-	"":         "RangeAllocationList is a list of RangeAllocations objects",
-	"metadata": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
-	"items":    "List of RangeAllocations.",
+	"":      "RangeAllocationList is a list of RangeAllocations objects",
+	"items": "List of RangeAllocations.",
 }
 
 func (RangeAllocationList) SwaggerDoc() map[string]string {
@@ -165,7 +163,6 @@ func (SELinuxContextStrategyOptions) SwaggerDoc() map[string]string {
 
 var map_SecurityContextConstraints = map[string]string{
 	"":                                "SecurityContextConstraints governs the ability to make requests that affect the SecurityContext that will be applied to a container. For historical reasons SCC was exposed under the core Kubernetes API group. That exposure is deprecated and will be removed in a future release - users should instead use the security.openshift.io group to manage SecurityContextConstraints.",
-	"metadata":                        "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
 	"priority":                        "Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields.  The higher the int, the higher priority. An unset value is considered a 0 priority. If scores for multiple SCCs are equal they will be sorted from most restrictive to least restrictive. If both priorities and restrictions are equal the SCCs will be sorted by name.",
 	"allowPrivilegedContainer":        "AllowPrivilegedContainer determines if a container can request to be run as privileged.",
 	"defaultAddCapabilities":          "DefaultAddCapabilities is the default set of capabilities that will be added to the container unless the pod spec specifically drops the capability.  You may not list a capabiility in both DefaultAddCapabilities and RequiredDropCapabilities.",
@@ -197,9 +194,8 @@ func (SecurityContextConstraints) SwaggerDoc() map[string]string {
 }
 
 var map_SecurityContextConstraintsList = map[string]string{
-	"":         "SecurityContextConstraintsList is a list of SecurityContextConstraints objects",
-	"metadata": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata",
-	"items":    "List of security context constraints.",
+	"":      "SecurityContextConstraintsList is a list of SecurityContextConstraints objects",
+	"items": "List of security context constraints.",
 }
 
 func (SecurityContextConstraintsList) SwaggerDoc() map[string]string {
diff --git a/servicecertsigner/v1alpha1/types.go b/servicecertsigner/v1alpha1/types.go
index 5ae45591088..37cc8c79159 100644
--- a/servicecertsigner/v1alpha1/types.go
+++ b/servicecertsigner/v1alpha1/types.go
@@ -76,18 +76,21 @@ type ServiceCertSignerOperatorConfigSpec struct {
 	// it will end up overlaying in the following order:
 	// 1. hardcoded default
 	// 2. this config
+	// +kubebuilder:validation:PreserveUnknownFields
 	ServiceServingCertSignerConfig runtime.RawExtension `json:"serviceServingCertSignerConfig"`
 
 	// apiServiceCABundleInjectorConfig holds a sparse config that the user wants for this component.  It only needs to be the overrides from the defaults
 	// it will end up overlaying in the following order:
 	// 1. hardcoded default
 	// 2. this config
+	// +kubebuilder:validation:PreserveUnknownFields
 	APIServiceCABundleInjectorConfig runtime.RawExtension `json:"apiServiceCABundleInjectorConfig"`
 
 	// configMapCABundleInjectorConfig holds a sparse config that the user wants for this component.  It only needs to be the overrides from the defaults
 	// it will end up overlaying in the following order:
 	// 1. hardcoded default
 	// 2. this config
+	// +kubebuilder:validation:PreserveUnknownFields
 	ConfigMapCABundleInjectorConfig runtime.RawExtension `json:"configMapCABundleInjectorConfig"`
 }
 
@@ -100,8 +103,8 @@ type ServiceCertSignerOperatorConfigStatus struct {
 // ServiceCertSignerOperatorConfigList is a collection of items
 type ServiceCertSignerOperatorConfigList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty"`
+
 	// Items contains the items
 	Items []ServiceCertSignerOperatorConfig `json:"items"`
 }
diff --git a/servicecertsigner/v1alpha1/zz_generated.swagger_doc_generated.go b/servicecertsigner/v1alpha1/zz_generated.swagger_doc_generated.go
index 3401480cd85..6514f6f6c91 100644
--- a/servicecertsigner/v1alpha1/zz_generated.swagger_doc_generated.go
+++ b/servicecertsigner/v1alpha1/zz_generated.swagger_doc_generated.go
@@ -38,9 +38,8 @@ func (ServiceCertSignerOperatorConfig) SwaggerDoc() map[string]string {
 }
 
 var map_ServiceCertSignerOperatorConfigList = map[string]string{
-	"":         "ServiceCertSignerOperatorConfigList is a collection of items",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items contains the items",
+	"":      "ServiceCertSignerOperatorConfigList is a collection of items",
+	"items": "Items contains the items",
 }
 
 func (ServiceCertSignerOperatorConfigList) SwaggerDoc() map[string]string {
diff --git a/template/v1/generated.proto b/template/v1/generated.proto
index aa51f841270..49cc228c0de 100644
--- a/template/v1/generated.proto
+++ b/template/v1/generated.proto
@@ -16,7 +16,6 @@ option go_package = "v1";
 // BrokerTemplateInstance holds the service broker-related state associated with
 // a TemplateInstance.  BrokerTemplateInstance is part of an experimental API.
 message BrokerTemplateInstance {
-  // Standard object metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // spec describes the state of this BrokerTemplateInstance.
@@ -25,7 +24,6 @@ message BrokerTemplateInstance {
 
 // BrokerTemplateInstanceList is a list of BrokerTemplateInstance objects.
 message BrokerTemplateInstanceList {
-  // Standard object metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // items is a list of BrokerTemplateInstances
@@ -102,7 +100,6 @@ message Parameter {
 
 // Template contains the inputs needed to produce a Config.
 message Template {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // message is an optional instructional message that will
@@ -119,6 +116,7 @@ message Template {
   // is, or contains, a ${PARAMETER_REFERENCE}, the resolved
   // value after parameter substitution will be respected and the object
   // will be created in that namespace.
+  // +kubebuilder:validation:PreserveUnknownFields
   repeated k8s.io.apimachinery.pkg.runtime.RawExtension objects = 3;
 
   // parameters is an optional array of Parameters used during the
@@ -133,7 +131,6 @@ message Template {
 // TemplateInstance requests and records the instantiation of a Template.
 // TemplateInstance is part of an experimental API.
 message TemplateInstance {
-  // Standard object metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // spec describes the desired state of this TemplateInstance.
@@ -167,7 +164,6 @@ message TemplateInstanceCondition {
 
 // TemplateInstanceList is a list of TemplateInstance objects.
 message TemplateInstanceList {
-  // Standard object metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // items is a list of Templateinstances
@@ -226,7 +222,6 @@ message TemplateInstanceStatus {
 
 // TemplateList is a list of Template objects.
 message TemplateList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is a list of templates
diff --git a/template/v1/types.go b/template/v1/types.go
index a832c7c73d4..1c712680646 100644
--- a/template/v1/types.go
+++ b/template/v1/types.go
@@ -13,8 +13,7 @@ import (
 
 // Template contains the inputs needed to produce a Config.
 type Template struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// message is an optional instructional message that will
@@ -31,6 +30,7 @@ type Template struct {
 	// is, or contains, a ${PARAMETER_REFERENCE}, the resolved
 	// value after parameter substitution will be respected and the object
 	// will be created in that namespace.
+	// +kubebuilder:validation:PreserveUnknownFields
 	Objects []runtime.RawExtension `json:"objects" protobuf:"bytes,3,rep,name=objects"`
 
 	// parameters is an optional array of Parameters used during the
@@ -47,7 +47,6 @@ type Template struct {
 // TemplateList is a list of Template objects.
 type TemplateList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Items is a list of templates
@@ -105,8 +104,7 @@ type Parameter struct {
 // TemplateInstance requests and records the instantiation of a Template.
 // TemplateInstance is part of an experimental API.
 type TemplateInstance struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// spec describes the desired state of this TemplateInstance.
@@ -211,7 +209,6 @@ type TemplateInstanceObject struct {
 // TemplateInstanceList is a list of TemplateInstance objects.
 type TemplateInstanceList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// items is a list of Templateinstances
@@ -225,8 +222,7 @@ type TemplateInstanceList struct {
 // BrokerTemplateInstance holds the service broker-related state associated with
 // a TemplateInstance.  BrokerTemplateInstance is part of an experimental API.
 type BrokerTemplateInstance struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// spec describes the state of this BrokerTemplateInstance.
@@ -253,7 +249,6 @@ type BrokerTemplateInstanceSpec struct {
 // BrokerTemplateInstanceList is a list of BrokerTemplateInstance objects.
 type BrokerTemplateInstanceList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// items is a list of BrokerTemplateInstances
diff --git a/template/v1/zz_generated.swagger_doc_generated.go b/template/v1/zz_generated.swagger_doc_generated.go
index 001a477b4a4..bbf8153101c 100644
--- a/template/v1/zz_generated.swagger_doc_generated.go
+++ b/template/v1/zz_generated.swagger_doc_generated.go
@@ -12,9 +12,8 @@ package v1
 
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_BrokerTemplateInstance = map[string]string{
-	"":         "BrokerTemplateInstance holds the service broker-related state associated with a TemplateInstance.  BrokerTemplateInstance is part of an experimental API.",
-	"metadata": "Standard object metadata.",
-	"spec":     "spec describes the state of this BrokerTemplateInstance.",
+	"":     "BrokerTemplateInstance holds the service broker-related state associated with a TemplateInstance.  BrokerTemplateInstance is part of an experimental API.",
+	"spec": "spec describes the state of this BrokerTemplateInstance.",
 }
 
 func (BrokerTemplateInstance) SwaggerDoc() map[string]string {
@@ -22,9 +21,8 @@ func (BrokerTemplateInstance) SwaggerDoc() map[string]string {
 }
 
 var map_BrokerTemplateInstanceList = map[string]string{
-	"":         "BrokerTemplateInstanceList is a list of BrokerTemplateInstance objects.",
-	"metadata": "Standard object metadata.",
-	"items":    "items is a list of BrokerTemplateInstances",
+	"":      "BrokerTemplateInstanceList is a list of BrokerTemplateInstance objects.",
+	"items": "items is a list of BrokerTemplateInstances",
 }
 
 func (BrokerTemplateInstanceList) SwaggerDoc() map[string]string {
@@ -59,7 +57,6 @@ func (Parameter) SwaggerDoc() map[string]string {
 
 var map_Template = map[string]string{
 	"":           "Template contains the inputs needed to produce a Config.",
-	"metadata":   "Standard object's metadata.",
 	"message":    "message is an optional instructional message that will be displayed when this template is instantiated. This field should inform the user how to utilize the newly created resources. Parameter substitution will be performed on the message before being displayed so that generated credentials and other parameters can be included in the output.",
 	"objects":    "objects is an array of resources to include in this template. If a namespace value is hardcoded in the object, it will be removed during template instantiation, however if the namespace value is, or contains, a ${PARAMETER_REFERENCE}, the resolved value after parameter substitution will be respected and the object will be created in that namespace.",
 	"parameters": "parameters is an optional array of Parameters used during the Template to Config transformation.",
@@ -71,10 +68,9 @@ func (Template) SwaggerDoc() map[string]string {
 }
 
 var map_TemplateInstance = map[string]string{
-	"":         "TemplateInstance requests and records the instantiation of a Template. TemplateInstance is part of an experimental API.",
-	"metadata": "Standard object metadata.",
-	"spec":     "spec describes the desired state of this TemplateInstance.",
-	"status":   "status describes the current state of this TemplateInstance.",
+	"":       "TemplateInstance requests and records the instantiation of a Template. TemplateInstance is part of an experimental API.",
+	"spec":   "spec describes the desired state of this TemplateInstance.",
+	"status": "status describes the current state of this TemplateInstance.",
 }
 
 func (TemplateInstance) SwaggerDoc() map[string]string {
@@ -95,9 +91,8 @@ func (TemplateInstanceCondition) SwaggerDoc() map[string]string {
 }
 
 var map_TemplateInstanceList = map[string]string{
-	"":         "TemplateInstanceList is a list of TemplateInstance objects.",
-	"metadata": "Standard object metadata.",
-	"items":    "items is a list of Templateinstances",
+	"":      "TemplateInstanceList is a list of TemplateInstance objects.",
+	"items": "items is a list of Templateinstances",
 }
 
 func (TemplateInstanceList) SwaggerDoc() map[string]string {
@@ -147,9 +142,8 @@ func (TemplateInstanceStatus) SwaggerDoc() map[string]string {
 }
 
 var map_TemplateList = map[string]string{
-	"":         "TemplateList is a list of Template objects.",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is a list of templates",
+	"":      "TemplateList is a list of Template objects.",
+	"items": "Items is a list of templates",
 }
 
 func (TemplateList) SwaggerDoc() map[string]string {
diff --git a/user/v1/generated.proto b/user/v1/generated.proto
index 042e02a5336..7444d41ef07 100644
--- a/user/v1/generated.proto
+++ b/user/v1/generated.proto
@@ -14,7 +14,6 @@ option go_package = "v1";
 
 // Group represents a referenceable set of Users
 message Group {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Users is the list of users in this group.
@@ -23,7 +22,6 @@ message Group {
 
 // GroupList is a collection of Groups
 message GroupList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of groups
@@ -36,7 +34,6 @@ message GroupList {
 // user. Information retrieved from the authentication provider is stored in the extra field
 // using a schema determined by the provider.
 message Identity {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // ProviderName is the source of identity information
@@ -55,7 +52,6 @@ message Identity {
 
 // IdentityList is a collection of Identities
 message IdentityList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of identities
@@ -77,7 +73,6 @@ message OptionalNames {
 // identity provider - if a user already exists with the incoming name, the user name may have
 // a number appended to it depending on the configuration of the system.
 message User {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // FullName is the full name of user
@@ -94,7 +89,6 @@ message User {
 
 // UserIdentityMapping maps a user to an identity
 message UserIdentityMapping {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Identity is a reference to an identity
@@ -106,7 +100,6 @@ message UserIdentityMapping {
 
 // UserList is a collection of Users
 message UserList {
-  // Standard object's metadata.
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta metadata = 1;
 
   // Items is the list of users
diff --git a/user/v1/types.go b/user/v1/types.go
index 6881b1728eb..8708d027353 100644
--- a/user/v1/types.go
+++ b/user/v1/types.go
@@ -17,8 +17,7 @@ import (
 // identity provider - if a user already exists with the incoming name, the user name may have
 // a number appended to it depending on the configuration of the system.
 type User struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// FullName is the full name of user
@@ -38,8 +37,8 @@ type User struct {
 // UserList is a collection of Users
 type UserList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of users
 	Items []User `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -54,8 +53,7 @@ type UserList struct {
 // user. Information retrieved from the authentication provider is stored in the extra field
 // using a schema determined by the provider.
 type Identity struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// ProviderName is the source of identity information
@@ -77,8 +75,8 @@ type Identity struct {
 // IdentityList is a collection of Identities
 type IdentityList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of identities
 	Items []Identity `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
@@ -90,8 +88,7 @@ type IdentityList struct {
 
 // UserIdentityMapping maps a user to an identity
 type UserIdentityMapping struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Identity is a reference to an identity
@@ -115,8 +112,7 @@ func (t OptionalNames) String() string {
 
 // Group represents a referenceable set of Users
 type Group struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Users is the list of users in this group.
@@ -128,8 +124,8 @@ type Group struct {
 // GroupList is a collection of Groups
 type GroupList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+
 	// Items is the list of groups
 	Items []Group `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
diff --git a/user/v1/zz_generated.swagger_doc_generated.go b/user/v1/zz_generated.swagger_doc_generated.go
index 0b30f12b83c..e034251f965 100644
--- a/user/v1/zz_generated.swagger_doc_generated.go
+++ b/user/v1/zz_generated.swagger_doc_generated.go
@@ -12,9 +12,8 @@ package v1
 
 // AUTO-GENERATED FUNCTIONS START HERE
 var map_Group = map[string]string{
-	"":         "Group represents a referenceable set of Users",
-	"metadata": "Standard object's metadata.",
-	"users":    "Users is the list of users in this group.",
+	"":      "Group represents a referenceable set of Users",
+	"users": "Users is the list of users in this group.",
 }
 
 func (Group) SwaggerDoc() map[string]string {
@@ -22,9 +21,8 @@ func (Group) SwaggerDoc() map[string]string {
 }
 
 var map_GroupList = map[string]string{
-	"":         "GroupList is a collection of Groups",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of groups",
+	"":      "GroupList is a collection of Groups",
+	"items": "Items is the list of groups",
 }
 
 func (GroupList) SwaggerDoc() map[string]string {
@@ -33,7 +31,6 @@ func (GroupList) SwaggerDoc() map[string]string {
 
 var map_Identity = map[string]string{
 	"":                 "Identity records a successful authentication of a user with an identity provider. The information about the source of authentication is stored on the identity, and the identity is then associated with a single user object. Multiple identities can reference a single user. Information retrieved from the authentication provider is stored in the extra field using a schema determined by the provider.",
-	"metadata":         "Standard object's metadata.",
 	"providerName":     "ProviderName is the source of identity information",
 	"providerUserName": "ProviderUserName uniquely represents this identity in the scope of the provider",
 	"user":             "User is a reference to the user this identity is associated with Both Name and UID must be set",
@@ -45,9 +42,8 @@ func (Identity) SwaggerDoc() map[string]string {
 }
 
 var map_IdentityList = map[string]string{
-	"":         "IdentityList is a collection of Identities",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of identities",
+	"":      "IdentityList is a collection of Identities",
+	"items": "Items is the list of identities",
 }
 
 func (IdentityList) SwaggerDoc() map[string]string {
@@ -56,7 +52,6 @@ func (IdentityList) SwaggerDoc() map[string]string {
 
 var map_User = map[string]string{
 	"":           "Upon log in, every user of the system receives a User and Identity resource. Administrators may directly manipulate the attributes of the users for their own tracking, or set groups via the API. The user name is unique and is chosen based on the value provided by the identity provider - if a user already exists with the incoming name, the user name may have a number appended to it depending on the configuration of the system.",
-	"metadata":   "Standard object's metadata.",
 	"fullName":   "FullName is the full name of user",
 	"identities": "Identities are the identities associated with this user",
 	"groups":     "Groups specifies group names this user is a member of. This field is deprecated and will be removed in a future release. Instead, create a Group object containing the name of this User.",
@@ -68,7 +63,6 @@ func (User) SwaggerDoc() map[string]string {
 
 var map_UserIdentityMapping = map[string]string{
 	"":         "UserIdentityMapping maps a user to an identity",
-	"metadata": "Standard object's metadata.",
 	"identity": "Identity is a reference to an identity",
 	"user":     "User is a reference to a user",
 }
@@ -78,9 +72,8 @@ func (UserIdentityMapping) SwaggerDoc() map[string]string {
 }
 
 var map_UserList = map[string]string{
-	"":         "UserList is a collection of Users",
-	"metadata": "Standard object's metadata.",
-	"items":    "Items is the list of users",
+	"":      "UserList is a collection of Users",
+	"items": "Items is the list of users",
 }
 
 func (UserList) SwaggerDoc() map[string]string {