mirror of
https://github.com/kubernetes/sample-controller.git
synced 2026-05-01 00:00:03 +08:00
c0feae0701
Automatic merge from submit-queue (batch tested with PRs 59965, 59115, 63076, 63059). 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>. Upgrade dep json-iterator/go to fix base64 decode bug **What this PR does / why we need it**: upgrade dep `json-iterator/go` to fix base64 decode bug #62742 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #62742 **Special notes for your reviewer**: Just upgrade `json-iterator/go` to latest which includes base64 decode fix https://github.com/json-iterator/go/pull/266 No other code changes **Release note**: ```release-note None ``` Kubernetes-commit: 3dbcd1ddcee786f443f89a82514bbd9c6ad06c99
46 lines
1.6 KiB
Go
46 lines
1.6 KiB
Go
/*
|
|
Copyright 2016 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.
|
|
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.
|
|
*/
|
|
|
|
package meta
|
|
|
|
import (
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
)
|
|
|
|
// InterfacesForUnstructuredConversion returns VersionInterfaces suitable for
|
|
// dealing with unstructured.Unstructured objects and supports conversion
|
|
// from typed objects (provided by parent) to untyped objects.
|
|
func InterfacesForUnstructuredConversion(parent VersionInterfacesFunc) VersionInterfacesFunc {
|
|
return func(version schema.GroupVersion) (*VersionInterfaces, error) {
|
|
if i, err := parent(version); err == nil {
|
|
return &VersionInterfaces{
|
|
ObjectConvertor: i.ObjectConvertor,
|
|
}, nil
|
|
}
|
|
return InterfacesForUnstructured(version)
|
|
}
|
|
}
|
|
|
|
// InterfacesForUnstructured returns VersionInterfaces suitable for
|
|
// dealing with unstructured.Unstructured objects. It will return errors for
|
|
// other conversions.
|
|
func InterfacesForUnstructured(schema.GroupVersion) (*VersionInterfaces, error) {
|
|
return &VersionInterfaces{
|
|
ObjectConvertor: &unstructured.UnstructuredObjectConverter{},
|
|
}, nil
|
|
}
|