Move celopenapi/model to staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/ (#109959)

Co-authored-by: Manish Kumar <manish.kumar1@india.nec.com>

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/cel_validation.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/metrics"
-	celmodel "k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	celmodel "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 )
 
 const (

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation_test.go

@@ -24,7 +24,7 @@ import (
 
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 )
 
 const (

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library/urls.go

@@ -22,7 +22,7 @@ import (
 	"github.com/google/cel-go/cel"
 	"github.com/google/cel-go/common/types"
 	"github.com/google/cel-go/common/types/ref"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 )
 
 // URLs provides a CEL function library extension of URL parsing functions.

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/registry.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 
@@ -38,9 +40,6 @@ const (
 	minDurationSizeJSON = 3
 	// RFC 3339 dates require YYYY-MM-DD, and then we add 2 to allow for quotation marks
 	dateSizeJSON = 12
-	// RFC 3339 times require 2-digit 24-hour time at the very least plus a capital T at the start,
-	// e.g., T23, and we add 2 to allow for quotation marks as usual
-	minTimeSizeJSON = 5
 	// RFC 3339 datetimes require a full date (YYYY-MM-DD) and full time (HH:MM:SS), and we add 3 for
 	// quotation marks like always in addition to the capital T that separates the date and time
 	minDatetimeSizeJSON = 21

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas_test.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE-2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 
@@ -335,12 +337,12 @@ func TestEstimateMaxLengthJSON(t *testing.T) {
 						Type: "object",
 					},
 					Properties: map[string]schema.Structural{
-						"required": schema.Structural{
+						"required": {
 							Generic: schema.Generic{
 								Type: "string",
 							},
 						},
-						"optional": schema.Structural{
+						"optional": {
 							Generic: schema.Generic{
 								Type: "string",
 							},
@@ -453,7 +455,7 @@ func TestEstimateMaxLengthJSON(t *testing.T) {
 						Type: "object",
 					},
 					Properties: map[string]schema.Structural{
-						"field": schema.Structural{
+						"field": {
 							Generic: schema.Generic{
 								Type:    "string",
 								Default: schema.JSON{Object: "default"},

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/types.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE-2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 
@@ -473,35 +475,6 @@ func (rt *RuleTypes) findDeclType(typeName string) (*DeclType, bool) {
 	return nil, false
 }
 
-func (rt *RuleTypes) convertToCustomType(dyn *DynValue, declType *DeclType) *DynValue {
-	switch v := dyn.Value().(type) {
-	case *MapValue:
-		if declType.IsObject() {
-			obj := v.ConvertToObject(declType)
-			for name, f := range obj.fieldMap {
-				field := declType.Fields[name]
-				f.Ref = rt.convertToCustomType(f.Ref, field.Type)
-			}
-			dyn.SetValue(obj)
-			return dyn
-		}
-		fieldType := declType.ElemType
-		for _, f := range v.fieldMap {
-			f.Ref = rt.convertToCustomType(f.Ref, fieldType)
-		}
-		return dyn
-	case *ListValue:
-		for i := 0; i < len(v.Entries); i++ {
-			elem := v.Entries[i]
-			elem = rt.convertToCustomType(elem, declType.ElemType)
-			v.Entries[i] = elem
-		}
-		return dyn
-	default:
-		return dyn
-	}
-}
-
 func newSchemaTypeProvider(kind string, declType *DeclType) (*schemaTypeProvider, error) {
 	if declType == nil {
 		return nil, nil

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/types_test.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE-2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/url.go

@@ -1,16 +1,18 @@
-// Copyright 2022 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE-2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 
@@ -706,9 +708,7 @@ func (lv *ListValue) finalizeValueSet() {
 	for _, e := range lv.Entries {
 		switch e.value.(type) {
 		case bool, float64, int64, string, uint64, types.Null, PlainTextValue:
-			if valueSet != nil {
 			valueSet[e.ExprValue()] = struct{}{}
-			}
 		default:
 			lv.valueSet = nil
 			return

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/value_test.go

@@ -1,16 +1,18 @@
-// Copyright 2020 Google LLC
+/*
-//
+Copyright 2022 The Kubernetes Authors.
-// Licensed under the Apache License, Version 2.0 (the "License");
+
-// you may not use this file except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the "License");
-// You may obtain a copy of the License at
+you may not use this file except in compliance with the License.
-//
+You may obtain a copy of the License at
-//    https://www.apache.org/licenses/LICENSE-2.0
+
-//
+    http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
+
-// distributed under the License is distributed on an "AS IS" BASIS,
+Unless required by applicable law or agreed to in writing, software
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+distributed under the License is distributed on an "AS IS" BASIS,
-// See the License for the specific language governing permissions and
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// limitations under the License.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 
 package model
 
@@ -322,9 +324,9 @@ func TestMapValueIsSet(t *testing.T) {
 
 func TestObjectValueEqual(t *testing.T) {
 	objType := NewObjectType("Notice", map[string]*DeclField{
-		"name":     &DeclField{Name: "name", Type: StringType},
+		"name":     {Name: "name", Type: StringType},
-		"priority": &DeclField{Name: "priority", Type: IntType},
+		"priority": {Name: "priority", Type: IntType},
-		"message":  &DeclField{Name: "message", Type: StringType, defaultValue: "<eom>"},
+		"message":  {Name: "message", Type: StringType, defaultValue: "<eom>"},
 	})
 	name := NewField(1, "name")
 	name.Ref = testValue(t, 2, "alert")

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go

@@ -31,7 +31,7 @@ import (
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/metrics"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go

@@ -28,7 +28,7 @@ import (
 
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/values.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/equality"
 
 	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
-	"k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model"
 	"k8s.io/kube-openapi/pkg/validation/strfmt"
 )
 

staging/src/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/LICENSE

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

staging/src/k8s.io/apiserver/pkg/server/config.go

@@ -360,7 +360,7 @@ func NewConfig(codecs serializer.CodecFactory) *Config {
 		// A request body might be encoded in json, and is converted to
 		// proto when persisted in etcd, so we allow 2x as the largest request
 		// body size to be accepted and decoded in a write request.
-		// If this constant is changed, maxRequestSizeBytes in apiextensions-apiserver/third_party/forked/celopenapi/model/schemas.go
+		// If this constant is changed, maxRequestSizeBytes in apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas.go
 		// should be changed to reflect the new value, if the two haven't
 		// been wired together already somehow.
 		MaxRequestBodyBytes: int64(3 * 1024 * 1024),

vendor/modules.txt

@@ -1323,6 +1323,7 @@ k8s.io/apiextensions-apiserver/pkg/apiserver/schema
 k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel
 k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library
 k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/metrics
+k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model
 k8s.io/apiextensions-apiserver/pkg/apiserver/schema/defaulting
 k8s.io/apiextensions-apiserver/pkg/apiserver/schema/listtype
 k8s.io/apiextensions-apiserver/pkg/apiserver/schema/objectmeta
@@ -1357,7 +1358,6 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor
 k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition
 k8s.io/apiextensions-apiserver/test/integration
 k8s.io/apiextensions-apiserver/test/integration/fixtures
-k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model
 # k8s.io/apimachinery v0.0.0 => ./staging/src/k8s.io/apimachinery
 ## explicit; go 1.19
 k8s.io/apimachinery/pkg/api/apitesting