github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 20:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #132724 from PatrickLaabs/132086-apiext-controller

Browse Source 
chore: depr. pointer pkg replacement for apiext. pkg/cntroller
This commit is contained in:
Kubernetes Prow Robot
2025-07-05 12:19:24 -07:00
committed by GitHub
parent 22f5e01a37 4a205cc7fd
commit f5e136df9d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/builder/builder_test.go
View File

@@ -32,7 +32,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/endpoints"
"k8s.io/kube-openapi/pkg/validation/spec"
utilpointer "k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)
@@ -479,7 +478,7 @@ func TestBuildOpenAPIV2(t *testing.T) {
}
}
if tt.preserveUnknownFields != nil && *tt.preserveUnknownFields {
validation.OpenAPIV3Schema.XPreserveUnknownFields = utilpointer.BoolPtr(true)
validation.OpenAPIV3Schema.XPreserveUnknownFields = ptr.To(true)
}
// TODO: mostly copied from the test above. reuse code to cleanup
@@ -589,7 +588,7 @@ func TestBuildOpenAPIV3(t *testing.T) {
}
}
if tt.preserveUnknownFields != nil && *tt.preserveUnknownFields {
validation.OpenAPIV3Schema.XPreserveUnknownFields = utilpointer.BoolPtr(true)
validation.OpenAPIV3Schema.XPreserveUnknownFields = ptr.To(true)
}
got, err := BuildOpenAPIV3(&apiextensionsv1.CustomResourceDefinition{

6
staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go
View File

@@ -35,7 +35,7 @@ import (
structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
"k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kube-openapi/pkg/validation/spec"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)
func Test_ConvertJSONSchemaPropsToOpenAPIv2Schema(t *testing.T) {
@@ -646,7 +646,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) {
{
name: "preserve-unknown-fields in arrays",
in: &apiextensions.JSONSchemaProps{
XPreserveUnknownFields: pointer.BoolPtr(true),
XPreserveUnknownFields: ptr.To(true),
Type: "array",
Items: &apiextensions.JSONSchemaPropsOrArray{Schema: &apiextensions.JSONSchemaProps{
Type: "string",
@@ -657,7 +657,7 @@ func Test_ConvertJSONSchemaPropsToOpenAPIv2SchemaByType(t *testing.T) {
{
name: "preserve-unknown-fields in objects",
in: &apiextensions.JSONSchemaProps{
XPreserveUnknownFields: pointer.BoolPtr(true),
XPreserveUnknownFields: ptr.To(true),
Type: "object",
Properties: map[string]apiextensions.JSONSchemaProps{
"foo": {