From b8670cbc31c79abb70dc232eb37373b7e6d4f4e2 Mon Sep 17 00:00:00 2001 From: Konstantinos Angelopoulos Date: Wed, 8 Oct 2025 15:48:09 +0200 Subject: [PATCH] reduce dependencies to apiextension objects --- .../pkg/util/strategicpatch/patch_test.go | 27 +++++++++---------- .../testdata/swagger-merge-item-v3.json | 10 +------ .../testdata/swagger-merge-item.json | 4 --- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go index 37ebb94d019..d18217fcafc 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go @@ -25,7 +25,6 @@ import ( "sigs.k8s.io/yaml" - apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/dump" "k8s.io/apimachinery/pkg/util/json" @@ -98,19 +97,19 @@ type StrategicMergePatchRawTestCaseData struct { } type MergeItem struct { - Name string `json:"name,omitempty"` - Value string `json:"value,omitempty"` - Other string `json:"other,omitempty"` - MergingList []MergeItem `json:"mergingList,omitempty" patchStrategy:"merge" patchMergeKey:"name"` - NonMergingList []MergeItem `json:"nonMergingList,omitempty"` - MergingIntList []int `json:"mergingIntList,omitempty" patchStrategy:"merge"` - NonMergingIntList []int `json:"nonMergingIntList,omitempty"` - MergeItemPtr *MergeItem `json:"mergeItemPtr,omitempty" patchStrategy:"merge" patchMergeKey:"name"` - SimpleMap map[string]string `json:"simpleMap,omitempty"` - ReplacingItem runtime.RawExtension `json:"replacingItem,omitempty" patchStrategy:"replace"` - JsonItem *apiextensionsv1.JSON `json:"jsonItem,omitempty"` - RetainKeysMap RetainKeysMergeItem `json:"retainKeysMap,omitempty" patchStrategy:"retainKeys"` - RetainKeysMergingList []MergeItem `json:"retainKeysMergingList,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"` + Name string `json:"name,omitempty"` + Value string `json:"value,omitempty"` + Other string `json:"other,omitempty"` + MergingList []MergeItem `json:"mergingList,omitempty" patchStrategy:"merge" patchMergeKey:"name"` + NonMergingList []MergeItem `json:"nonMergingList,omitempty"` + MergingIntList []int `json:"mergingIntList,omitempty" patchStrategy:"merge"` + NonMergingIntList []int `json:"nonMergingIntList,omitempty"` + MergeItemPtr *MergeItem `json:"mergeItemPtr,omitempty" patchStrategy:"merge" patchMergeKey:"name"` + SimpleMap map[string]string `json:"simpleMap,omitempty"` + ReplacingItem runtime.RawExtension `json:"replacingItem,omitempty" patchStrategy:"replace"` + JSONItem struct{ Raw []byte } `json:"jsonItem,omitempty"` + RetainKeysMap RetainKeysMergeItem `json:"retainKeysMap,omitempty" patchStrategy:"retainKeys"` + RetainKeysMergingList []MergeItem `json:"retainKeysMergingList,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"` } type RetainKeysMergeItem struct { diff --git a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item-v3.json b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item-v3.json index 25db2872a15..f5178156e27 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item-v3.json +++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item-v3.json @@ -98,12 +98,7 @@ "x-kubernetes-patch-strategy": "merge,retainKeys" }, "jsonItem": { - "description": "Values are the chart values.", - "allOf": [ - { - "$ref": "#/components/schemas/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON" - } - ] + "description": "Values are the chart values." } }, "x-kubernetes-group-version-kind": [ @@ -170,9 +165,6 @@ } ] }, - "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON": { - "description": "JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil." - }, "io.k8s.apimachinery.pkg.runtime.RawExtension": { "description": "RawExtension is used to hold extensions in external versions.", "required": [ diff --git a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item.json b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item.json index dcc8f0f7b49..c5abe757ec8 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item.json +++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testdata/swagger-merge-item.json @@ -89,7 +89,6 @@ }, "jsonItem": { "description": "JSON field", - "$ref": "#/definitions/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON", } }, "x-kubernetes-group-version-kind": [ @@ -157,9 +156,6 @@ } ] }, - "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON": { - "description": "JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil." - }, "io.k8s.apimachinery.pkg.runtime.RawExtension": { "description": "RawExtension is used to hold extensions in external versions.", "required": [