Initial UnstructuredExtract without caching

Kubernetes-commit: 6e481c5db19cda1ef1b7506c22c0046e440c7fe2
This commit is contained in:
Kevin Delgado 2021-07-03 00:05:11 +00:00 committed by Kubernetes Publisher
parent f0b4a7b510
commit 09e56ead9d
2 changed files with 8 additions and 5 deletions

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package internal
package fieldmanager
import (
"fmt"
@ -65,11 +65,15 @@ func NewGVKParser(models proto.Models, preserveUnknownFields bool) (*GvkParser,
panic(fmt.Sprintf("ListModels returns a model that can't be looked-up for: %v", modelName))
}
gvkList := parseGroupVersionKind(model)
//fmt.Println("+++")
//fmt.Printf("gvkList = %+v\n", gvkList)
//fmt.Println("+++")
for _, gvk := range gvkList {
if len(gvk.Kind) > 0 {
_, ok := parser.gvks[gvk]
if ok {
return nil, fmt.Errorf("duplicate entry for %v", gvk)
//return nil, fmt.Errorf("duplicate entry for %v", gvk)
fmt.Printf("duplicate entry for %v\n", gvk)
}
parser.gvks[gvk] = modelName
}

View File

@ -22,7 +22,6 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal"
"k8s.io/kube-openapi/pkg/util/proto"
"sigs.k8s.io/structured-merge-diff/v4/typed"
"sigs.k8s.io/structured-merge-diff/v4/value"
@ -65,7 +64,7 @@ func (DeducedTypeConverter) TypedToObject(value *typed.TypedValue) (runtime.Obje
}
type typeConverter struct {
parser *internal.GvkParser
parser *GvkParser
}
var _ TypeConverter = &typeConverter{}
@ -74,7 +73,7 @@ var _ TypeConverter = &typeConverter{}
// will automatically find the proper version of the object, and the
// corresponding schema information.
func NewTypeConverter(models proto.Models, preserveUnknownFields bool) (TypeConverter, error) {
parser, err := internal.NewGVKParser(models, preserveUnknownFields)
parser, err := NewGVKParser(models, preserveUnknownFields)
if err != nil {
return nil, err
}