
This commit resolves an issue where certain KubeletConfig fields, specifically: - FileCheckFrequency - VolumeStatsAggPeriod - EvictionPressureTransitionPeriod - Authorization.Mode - EvictionHard were inadvertently overridden when not explicitly set in drop-in configs. To retain the original values if they were absent in the drop-in configs, mergeKubeletConfigurations uses a JSON patch merge strategy to selectively merge configurations. It prevents essential configuration settings from being overridden, ensuring a more predictable behavior for users. Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com> Co-authored-by: Peter Hunt <pehunt@redhat.com>
123 lines
4.2 KiB
Go
123 lines
4.2 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 codec
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"k8s.io/klog/v2"
|
|
|
|
// ensure the core apis are installed
|
|
_ "k8s.io/kubernetes/pkg/apis/core/install"
|
|
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
"k8s.io/apimachinery/pkg/runtime/serializer"
|
|
"k8s.io/component-base/codec"
|
|
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
|
|
"k8s.io/kubernetes/pkg/kubelet/apis/config/scheme"
|
|
kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
|
|
)
|
|
|
|
// EncodeKubeletConfig encodes an internal KubeletConfiguration to an external YAML representation.
|
|
func EncodeKubeletConfig(internal *kubeletconfig.KubeletConfiguration, targetVersion schema.GroupVersion) ([]byte, error) {
|
|
encoder, err := NewKubeletconfigYAMLEncoder(targetVersion)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// encoder will convert to external version
|
|
data, err := runtime.Encode(encoder, internal)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return data, nil
|
|
}
|
|
|
|
// NewKubeletconfigYAMLEncoder returns an encoder that can write objects in the kubeletconfig API group to YAML.
|
|
func NewKubeletconfigYAMLEncoder(targetVersion schema.GroupVersion) (runtime.Encoder, error) {
|
|
_, codecs, err := scheme.NewSchemeAndCodecs()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
mediaType := "application/yaml"
|
|
info, ok := runtime.SerializerInfoForMediaType(codecs.SupportedMediaTypes(), mediaType)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unsupported media type %q", mediaType)
|
|
}
|
|
return codecs.EncoderForVersion(info.Serializer, targetVersion), nil
|
|
}
|
|
|
|
// DecodeKubeletConfiguration decodes a serialized KubeletConfiguration to the internal type.
|
|
func DecodeKubeletConfiguration(kubeletCodecs *serializer.CodecFactory, data []byte) (*kubeletconfig.KubeletConfiguration, error) {
|
|
var (
|
|
obj runtime.Object
|
|
gvk *schema.GroupVersionKind
|
|
)
|
|
|
|
// The UniversalDecoder runs defaulting and returns the internal type by default.
|
|
obj, gvk, err := kubeletCodecs.UniversalDecoder().Decode(data, nil, nil)
|
|
if err != nil {
|
|
// Try strict decoding first. If that fails decode with a lenient
|
|
// decoder, which has only v1beta1 registered, and log a warning.
|
|
// The lenient path is to be dropped when support for v1beta1 is dropped.
|
|
if !runtime.IsStrictDecodingError(err) {
|
|
return nil, fmt.Errorf("failed to decode: %w", err)
|
|
}
|
|
|
|
var lenientErr error
|
|
_, lenientCodecs, lenientErr := codec.NewLenientSchemeAndCodecs(
|
|
kubeletconfig.AddToScheme,
|
|
kubeletconfigv1beta1.AddToScheme,
|
|
)
|
|
|
|
if lenientErr != nil {
|
|
return nil, lenientErr
|
|
}
|
|
|
|
obj, gvk, lenientErr = lenientCodecs.UniversalDecoder().Decode(data, nil, nil)
|
|
if lenientErr != nil {
|
|
// Lenient decoding failed with the current version, return the
|
|
// original strict error.
|
|
return nil, fmt.Errorf("failed lenient decoding: %v", err)
|
|
}
|
|
// Continue with the v1beta1 object that was decoded leniently, but emit a warning.
|
|
klog.InfoS("Using lenient decoding as strict decoding failed", "err", err)
|
|
}
|
|
|
|
internalKC, ok := obj.(*kubeletconfig.KubeletConfiguration)
|
|
if !ok {
|
|
return nil, fmt.Errorf("failed to cast object to KubeletConfiguration, unexpected type: %v", gvk)
|
|
}
|
|
|
|
return internalKC, nil
|
|
}
|
|
|
|
// DecodeKubeletConfigurationIntoJSON decodes a serialized KubeletConfiguration to the internal type.
|
|
func DecodeKubeletConfigurationIntoJSON(kubeletCodecs *serializer.CodecFactory, data []byte) ([]byte, error) {
|
|
// The UniversalDecoder runs defaulting and returns the internal type by default.
|
|
obj, _, err := kubeletCodecs.UniversalDecoder().Decode(data, nil, &unstructured.Unstructured{})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
objT := obj.(*unstructured.Unstructured)
|
|
|
|
return json.Marshal(objT.Object)
|
|
}
|