diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 5a1c23ffee4..023f5838c06 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -17401,7 +17401,6 @@
         }
       },
       "required": [
-        "conditions",
         "acceptedNames",
         "storedVersions"
       ],
@@ -18030,7 +18029,6 @@
         }
       },
       "required": [
-        "conditions",
         "acceptedNames",
         "storedVersions"
       ],
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto
index 87c9ec4ca7e..70a2996d11d 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto
@@ -221,6 +221,7 @@ message CustomResourceDefinitionSpec {
 // CustomResourceDefinitionStatus indicates the state of the CustomResourceDefinition
 message CustomResourceDefinitionStatus {
   // Conditions indicate state for particular aspects of a CustomResourceDefinition
+  // +optional
   repeated CustomResourceDefinitionCondition conditions = 1;
 
   // AcceptedNames are the names that are actually being used to serve discovery
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
index da5a80e1660..4c30d7883f9 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go
@@ -295,6 +295,7 @@ type CustomResourceDefinitionCondition struct {
 // CustomResourceDefinitionStatus indicates the state of the CustomResourceDefinition
 type CustomResourceDefinitionStatus struct {
 	// Conditions indicate state for particular aspects of a CustomResourceDefinition
+	// +optional
 	Conditions []CustomResourceDefinitionCondition `json:"conditions" protobuf:"bytes,1,opt,name=conditions"`
 
 	// AcceptedNames are the names that are actually being used to serve discovery
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
index 47c06a296ad..0380ebf9aa4 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
@@ -260,6 +260,7 @@ message CustomResourceDefinitionSpec {
 // CustomResourceDefinitionStatus indicates the state of the CustomResourceDefinition
 message CustomResourceDefinitionStatus {
   // Conditions indicate state for particular aspects of a CustomResourceDefinition
+  // +optional
   repeated CustomResourceDefinitionCondition conditions = 1;
 
   // AcceptedNames are the names that are actually being used to serve discovery
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go
index 154ea836750..f99f5886ac5 100644
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go
@@ -337,6 +337,7 @@ type CustomResourceDefinitionCondition struct {
 // CustomResourceDefinitionStatus indicates the state of the CustomResourceDefinition
 type CustomResourceDefinitionStatus struct {
 	// Conditions indicate state for particular aspects of a CustomResourceDefinition
+	// +optional
 	Conditions []CustomResourceDefinitionCondition `json:"conditions" protobuf:"bytes,1,opt,name=conditions"`
 
 	// AcceptedNames are the names that are actually being used to serve discovery