Skip to content

K
k3s
Commit cd1c9f90 authored by Jordan Liggitt's avatar Jordan Liggitt
Browse files
Options

Revert kubelet to default to ttl cache secret/configmap behavior

parent 23a41c9d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml
View file @ cd1c9f90
......@@ -101,7 +101,7 @@ cgroupsPerQOS: true
clusterDNS:
- 10.192.0.10
clusterDomain: cluster.global
configMapAndSecretChangeDetectionStrategy: Watch
configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5
containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml
View file @ cd1c9f90
......@@ -101,7 +101,7 @@ cgroupsPerQOS: true
clusterDNS:
- 10.192.0.10
clusterDomain: cluster.global
configMapAndSecretChangeDetectionStrategy: Watch
configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5
containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf
......
pkg/kubelet/apis/config/v1beta1/defaults.go
View file @ cd1c9f90
......@@ -215,7 +215,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5)
}
if obj.ConfigMapAndSecretChangeDetectionStrategy == "" {
obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.WatchChangeDetectionStrategy
obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.TTLCacheChangeDetectionStrategy
}
if obj.EnforceNodeAllocatable == nil {
obj.EnforceNodeAllocatable = DefaultNodeAllocatableEnforcement
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment