Merge pull request #124568 from xyz-li/fix_apiserver_output

api: fix ValidatingAdmissionPolicyList json tag
2025-07-30 06:54:01 +00:00 · 2024-07-16 09:20:48 -07:00 · 2024-07-16 09:20:48 -07:00 · 130414950f
commit 130414950f
parent 64528d865e 18b81ab68c
8 changed files with 48 additions and 6 deletions
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@ -497,6 +497,9 @@
          "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
        }
      },
+      "required": [
+        "items"
+      ],
      "type": "object",
      "x-kubernetes-group-version-kind": [
        {
@ -555,6 +558,9 @@
          "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
        }
      },
+      "required": [
+        "items"
+      ],
      "type": "object",
      "x-kubernetes-group-version-kind": [
        {
@ -1136,6 +1142,9 @@
          "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
        }
      },
+      "required": [
+        "items"
+      ],
      "type": "object",
      "x-kubernetes-group-version-kind": [
        {
@ -1194,6 +1203,9 @@
          "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
        }
      },
+      "required": [
+        "items"
+      ],
      "type": "object",
      "x-kubernetes-group-version-kind": [
        {
@ -1609,6 +1621,9 @@
          "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
        }
      },
+      "required": [
+        "items"
+      ],
      "type": "object",
      "x-kubernetes-group-version-kind": [
        {
@ -1667,6 +1682,9 @@
          "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
        }
      },
+      "required": [
+        "items"
+      ],
      "type": "object",
      "x-kubernetes-group-version-kind": [
        {
--- a/api/openapi-spec/v3/apisadmissionregistration.k8s.iov1_openapi.json
+++ b/api/openapi-spec/v3/apisadmissionregistration.k8s.iov1_openapi.json
@ -622,6 +622,9 @@
            "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
          }
        },
+        "required": [
+          "items"
+        ],
        "type": "object",
        "x-kubernetes-group-version-kind": [
          {
@ -699,6 +702,9 @@
            "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
          }
        },
+        "required": [
+          "items"
+        ],
        "type": "object",
        "x-kubernetes-group-version-kind": [
          {
--- a/api/openapi-spec/v3/apisadmissionregistration.k8s.iov1alpha1_openapi.json
+++ b/api/openapi-spec/v3/apisadmissionregistration.k8s.iov1alpha1_openapi.json
@ -350,6 +350,9 @@
            "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
          }
        },
+        "required": [
+          "items"
+        ],
        "type": "object",
        "x-kubernetes-group-version-kind": [
          {
@ -427,6 +430,9 @@
            "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
          }
        },
+        "required": [
+          "items"
+        ],
        "type": "object",
        "x-kubernetes-group-version-kind": [
          {
--- a/api/openapi-spec/v3/apisadmissionregistration.k8s.iov1beta1_openapi.json
+++ b/api/openapi-spec/v3/apisadmissionregistration.k8s.iov1beta1_openapi.json
@ -351,6 +351,9 @@
            "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
          }
        },
+        "required": [
+          "items"
+        ],
        "type": "object",
        "x-kubernetes-group-version-kind": [
          {
@ -428,6 +431,9 @@
            "description": "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"
          }
        },
+        "required": [
+          "items"
+        ],
        "type": "object",
        "x-kubernetes-group-version-kind": [
          {
--- a/pkg/generated/openapi/zz_generated.openapi.go
+++ b/pkg/generated/openapi/zz_generated.openapi.go
@ -2257,6 +2257,7 @@ func schema_k8sio_api_admissionregistration_v1_ValidatingAdmissionPolicyBindingL
 						},
 					},
 				},
+				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
@ -2362,6 +2363,7 @@ func schema_k8sio_api_admissionregistration_v1_ValidatingAdmissionPolicyList(ref
 						},
 					},
 				},
+				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
@ -3444,6 +3446,7 @@ func schema_k8sio_api_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBi
 						},
 					},
 				},
+				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
@ -3549,6 +3552,7 @@ func schema_k8sio_api_admissionregistration_v1alpha1_ValidatingAdmissionPolicyLi
 						},
 					},
 				},
+				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
@ -4638,6 +4642,7 @@ func schema_k8sio_api_admissionregistration_v1beta1_ValidatingAdmissionPolicyBin
 						},
 					},
 				},
+				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
@ -4743,6 +4748,7 @@ func schema_k8sio_api_admissionregistration_v1beta1_ValidatingAdmissionPolicyLis
 						},
 					},
 				},
+				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
--- a/staging/src/k8s.io/api/admissionregistration/v1/types.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1/types.go
@ -205,7 +205,7 @@ type ValidatingAdmissionPolicyList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	// List of ValidatingAdmissionPolicy.
-	Items []ValidatingAdmissionPolicy `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []ValidatingAdmissionPolicy `json:"items" protobuf:"bytes,2,rep,name=items"`
 }

 // ValidatingAdmissionPolicySpec is the specification of the desired behavior of the AdmissionPolicy.
@ -466,7 +466,7 @@ type ValidatingAdmissionPolicyBindingList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	// List of PolicyBinding.
-	Items []ValidatingAdmissionPolicyBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []ValidatingAdmissionPolicyBinding `json:"items" protobuf:"bytes,2,rep,name=items"`
 }

 // ValidatingAdmissionPolicyBindingSpec is the specification of the ValidatingAdmissionPolicyBinding.
--- a/staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go
@ -142,7 +142,7 @@ type ValidatingAdmissionPolicyList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	// List of ValidatingAdmissionPolicy.
-	Items []ValidatingAdmissionPolicy `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []ValidatingAdmissionPolicy `json:"items" protobuf:"bytes,2,rep,name=items"`
 }

 // ValidatingAdmissionPolicySpec is the specification of the desired behavior of the AdmissionPolicy.
@ -404,7 +404,7 @@ type ValidatingAdmissionPolicyBindingList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	// List of PolicyBinding.
-	Items []ValidatingAdmissionPolicyBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []ValidatingAdmissionPolicyBinding `json:"items" protobuf:"bytes,2,rep,name=items"`
 }

 // ValidatingAdmissionPolicyBindingSpec is the specification of the ValidatingAdmissionPolicyBinding.
--- a/staging/src/k8s.io/api/admissionregistration/v1beta1/types.go
+++ b/staging/src/k8s.io/api/admissionregistration/v1beta1/types.go
@ -158,7 +158,7 @@ type ValidatingAdmissionPolicyList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	// List of ValidatingAdmissionPolicy.
-	Items []ValidatingAdmissionPolicy `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []ValidatingAdmissionPolicy `json:"items" protobuf:"bytes,2,rep,name=items"`
 }

 // ValidatingAdmissionPolicySpec is the specification of the desired behavior of the AdmissionPolicy.
@ -419,7 +419,7 @@ type ValidatingAdmissionPolicyBindingList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 	// List of PolicyBinding.
-	Items []ValidatingAdmissionPolicyBinding `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"`
+	Items []ValidatingAdmissionPolicyBinding `json:"items" protobuf:"bytes,2,rep,name=items"`
 }

 // ValidatingAdmissionPolicyBindingSpec is the specification of the ValidatingAdmissionPolicyBinding.