github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 11:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Remove dynamic log sanitization fields from Kubelet config validation

Browse Source
This commit is contained in:
Elana Hashman
2021-12-02 11:02:20 -08:00
parent 55a1936f58
commit dbd50d9f50
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/apis/config/helpers_test.go
View File

@@ -218,7 +218,6 @@ var (
"Logging.Options.JSON.InfoBufferSize.Quantity.i.value", "Logging.Options.JSON.InfoBufferSize.Quantity.i.value",
"Logging.Options.JSON.InfoBufferSize.Quantity.s", "Logging.Options.JSON.InfoBufferSize.Quantity.s",
"Logging.Options.JSON.SplitStream", "Logging.Options.JSON.SplitStream",
"Logging.Sanitization",
"Logging.VModule[*].FilePattern", "Logging.VModule[*].FilePattern",
"Logging.VModule[*].Verbosity", "Logging.VModule[*].Verbosity",
"Logging.Verbosity", "Logging.Verbosity",

4
pkg/kubelet/apis/config/v1beta1/defaults_test.go
View File

@@ -235,7 +235,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) {
Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Logging: componentbaseconfigv1alpha1.LoggingConfiguration{
Format: "", Format: "",
FlushFrequency: 5 * time.Second, FlushFrequency: 5 * time.Second,
Sanitization: false,
}, },
EnableSystemLogHandler: utilpointer.Bool(false), EnableSystemLogHandler: utilpointer.Bool(false),
ShutdownGracePeriod: zeroDuration, ShutdownGracePeriod: zeroDuration,
@@ -333,7 +332,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) {
Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Logging: componentbaseconfigv1alpha1.LoggingConfiguration{
Format: "text", Format: "text",
FlushFrequency: 5 * time.Second, FlushFrequency: 5 * time.Second,
Sanitization: false,
}, },
EnableSystemLogHandler: utilpointer.Bool(false), EnableSystemLogHandler: utilpointer.Bool(false),
ReservedMemory: []v1beta1.MemoryReservation{}, ReservedMemory: []v1beta1.MemoryReservation{},
@@ -476,7 +474,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) {
Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Logging: componentbaseconfigv1alpha1.LoggingConfiguration{
Format: "json", Format: "json",
FlushFrequency: 5 * time.Second, FlushFrequency: 5 * time.Second,
Sanitization: true,
}, },
EnableSystemLogHandler: utilpointer.Bool(true), EnableSystemLogHandler: utilpointer.Bool(true),
ShutdownGracePeriod: metav1.Duration{Duration: 60 * time.Second}, ShutdownGracePeriod: metav1.Duration{Duration: 60 * time.Second},
@@ -623,7 +620,6 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) {
Logging: componentbaseconfigv1alpha1.LoggingConfiguration{ Logging: componentbaseconfigv1alpha1.LoggingConfiguration{
Format: "json", Format: "json",
FlushFrequency: 5 * time.Second, FlushFrequency: 5 * time.Second,
Sanitization: true,
}, },
EnableSystemLogHandler: utilpointer.Bool(true), EnableSystemLogHandler: utilpointer.Bool(true),
ShutdownGracePeriod: metav1.Duration{Duration: 60 * time.Second}, ShutdownGracePeriod: metav1.Duration{Duration: 60 * time.Second},