bba15d358c
CodecFactory is started with EnableStrict that throws an error when deserializing a Kubelet component config that is malformed (e.g. unknown or duplicate keys). When strict decoding a v1beta1 config fails, non-strict decoding is used and a warning is emitted. For this, NewSchemeAndCodecs is now a variadic function that can take multiple arguments for augmenting the returned codec factory. Strict decoding is then explicitely enabled when decoding a kubelet config. Additionally, decoding a RemoteConfigSource needs to be non-strict to avoid an accidental error when it contains newer API fields that are not yet known to the Kubelet. DecodeKubeletConfiguration returns a wrapped error instead of a simple string so its type can be tested. Add unit tests for unhappy paths when loading a component config Add keys for test cases struct fields, remove nil field initialization Co-Authored-By: Jordan Liggitt <jordan@liggitt.net>
42 lines
1.5 KiB
Go
42 lines
1.5 KiB
Go
/*
|
|
Copyright 2017 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 scheme
|
|
|
|
import (
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/runtime/serializer"
|
|
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
|
|
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
|
|
)
|
|
|
|
// Utility functions for the Kubelet's kubeletconfig API group
|
|
|
|
// NewSchemeAndCodecs is a utility function that returns a Scheme and CodecFactory
|
|
// that understand the types in the kubeletconfig API group. Passing mutators allows
|
|
// for adjusting the behavior of the CodecFactory, for example enable strict decoding.
|
|
func NewSchemeAndCodecs(mutators ...serializer.CodecFactoryOptionsMutator) (*runtime.Scheme, *serializer.CodecFactory, error) {
|
|
scheme := runtime.NewScheme()
|
|
if err := kubeletconfig.AddToScheme(scheme); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if err := kubeletconfigv1beta1.AddToScheme(scheme); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
codecs := serializer.NewCodecFactory(scheme, mutators...)
|
|
return scheme, &codecs, nil
|
|
}
|