From dbd50d9f500834cdad6107bb7c7db61413a67fd5 Mon Sep 17 00:00:00 2001 From: Elana Hashman Date: Thu, 2 Dec 2021 11:02:20 -0800 Subject: [PATCH] Remove dynamic log sanitization fields from Kubelet config validation --- pkg/kubelet/apis/config/helpers_test.go | 1 - pkg/kubelet/apis/config/v1beta1/defaults_test.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/pkg/kubelet/apis/config/helpers_test.go b/pkg/kubelet/apis/config/helpers_test.go index 1a7725c984c..a0e5e6b38d9 100644 --- a/pkg/kubelet/apis/config/helpers_test.go +++ b/pkg/kubelet/apis/config/helpers_test.go @@ -218,7 +218,6 @@ var ( "Logging.Options.JSON.InfoBufferSize.Quantity.i.value", "Logging.Options.JSON.InfoBufferSize.Quantity.s", "Logging.Options.JSON.SplitStream", - "Logging.Sanitization", "Logging.VModule[*].FilePattern", "Logging.VModule[*].Verbosity", "Logging.Verbosity", diff --git a/pkg/kubelet/apis/config/v1beta1/defaults_test.go b/pkg/kubelet/apis/config/v1beta1/defaults_test.go index 63ae4db9b5e..8f6f4f4cbc1 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults_test.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults_test.go @@ -235,7 +235,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Format: "", FlushFrequency: 5 * time.Second, - Sanitization: false, }, EnableSystemLogHandler: utilpointer.Bool(false), ShutdownGracePeriod: zeroDuration, @@ -333,7 +332,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Format: "text", FlushFrequency: 5 * time.Second, - Sanitization: false, }, EnableSystemLogHandler: utilpointer.Bool(false), ReservedMemory: []v1beta1.MemoryReservation{}, @@ -476,7 +474,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Format: "json", FlushFrequency: 5 * time.Second, - Sanitization: true, }, EnableSystemLogHandler: utilpointer.Bool(true), ShutdownGracePeriod: metav1.Duration{Duration: 60 * time.Second}, @@ -623,7 +620,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Format: "json", FlushFrequency: 5 * time.Second, - Sanitization: true, }, EnableSystemLogHandler: utilpointer.Bool(true), ShutdownGracePeriod: metav1.Duration{Duration: 60 * time.Second},