Skip to content

K
k3s
Unverified Commit 0e42990e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63880 from sttts/sttts-move-scheme-ref-obj-to-smp

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. apimachinery: move schema reference object into smp patcher The schema reference object is only used in the strategic merge patch code path. This PR moves the creation there. This PR is a preparation to make the patcher compatible with the UnstructuredObjectConverter without internal types. It will allow us to return an error on missing kinds at https://github.com/kubernetes/kubernetes/pull/63830#discussion_r188171025.
parents e3b0e851 9745d6c1
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 14 deletions
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
View file @ 0e42990e
...@@ -82,12 +82,6 @@ func PatchResource(r rest.Patcher, scope RequestScope, admit admission.Interface ...@@ -82,12 +82,6 @@ func PatchResource(r rest.Patcher, scope RequestScope, admit admission.Interface
ctx := req.Context() ctx := req.Context()
ctx = request.WithNamespace(ctx, namespace) ctx = request.WithNamespace(ctx, namespace)
schemaReferenceObj, err := scope.UnsafeConvertor.ConvertToVersion(r.New(), scope.Kind.GroupVersion())
if err != nil {
scope.err(err, w, req)
return
}
patchJS, err := readBody(req) patchJS, err := readBody(req)
if err != nil { if err != nil {
scope.err(err, w, req) scope.err(err, w, req)
...@@ -134,8 +128,6 @@ func PatchResource(r rest.Patcher, scope RequestScope, admit admission.Interface ...@@ -134,8 +128,6 @@ func PatchResource(r rest.Patcher, scope RequestScope, admit admission.Interface
timeout: timeout, timeout: timeout,
schemaReferenceObj: schemaReferenceObj,
restPatcher: r, restPatcher: r,
name: name, name: name,
patchType: patchType, patchType: patchType,
...@@ -191,9 +183,6 @@ type patcher struct { ...@@ -191,9 +183,6 @@ type patcher struct {
timeout time.Duration timeout time.Duration
// Schema
schemaReferenceObj runtime.Object
// Operation information // Operation information
restPatcher rest.Patcher restPatcher rest.Patcher
name string name string
...@@ -263,6 +252,9 @@ func (p *jsonPatcher) applyJSPatch(versionedJS []byte) (patchedJS []byte, retErr ...@@ -263,6 +252,9 @@ func (p *jsonPatcher) applyJSPatch(versionedJS []byte) (patchedJS []byte, retErr
type smpPatcher struct { type smpPatcher struct {
*patcher *patcher
// Schema
schemaReferenceObj runtime.Object
} }
func (p *smpPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (runtime.Object, error) { func (p *smpPatcher) applyPatchToCurrentObject(currentObject runtime.Object) (runtime.Object, error) {
...@@ -352,7 +344,11 @@ func (p *patcher) patchResource(ctx context.Context) (runtime.Object, error) { ...@@ -352,7 +344,11 @@ func (p *patcher) patchResource(ctx context.Context) (runtime.Object, error) {
case types.JSONPatchType, types.MergePatchType: case types.JSONPatchType, types.MergePatchType:
p.mechanism = &jsonPatcher{patcher: p} p.mechanism = &jsonPatcher{patcher: p}
case types.StrategicMergePatchType: case types.StrategicMergePatchType:
p.mechanism = &smpPatcher{patcher: p} schemaReferenceObj, err := p.unsafeConvertor.ConvertToVersion(p.restPatcher.New(), p.kind.GroupVersion())
if err != nil {
return nil, err
}
p.mechanism = &smpPatcher{patcher: p, schemaReferenceObj: schemaReferenceObj}
default: default:
return nil, fmt.Errorf("%v: unimplemented patch type", p.patchType) return nil, fmt.Errorf("%v: unimplemented patch type", p.patchType)
} }
......
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
View file @ 0e42990e
...@@ -394,8 +394,6 @@ func (tc *patchTestCase) Run(t *testing.T) { ...@@ -394,8 +394,6 @@ func (tc *patchTestCase) Run(t *testing.T) {
timeout: 1 * time.Second, timeout: 1 * time.Second,
schemaReferenceObj: schemaReferenceObj,
restPatcher: testPatcher, restPatcher: testPatcher,
name: name, name: name,
patchType: patchType, patchType: patchType,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment