Skip to content

Commit cd1c9f9

Browse files
committed
Revert kubelet to default to ttl cache secret/configmap behavior
1 parent 23a41c9 commit cd1c9f9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ cgroupsPerQOS: true
101101
clusterDNS:
102102
- 10.192.0.10
103103
clusterDomain: cluster.global
104-
configMapAndSecretChangeDetectionStrategy: Watch
104+
configMapAndSecretChangeDetectionStrategy: Cache
105105
containerLogMaxFiles: 5
106106
containerLogMaxSize: 10Mi
107107
contentType: application/vnd.kubernetes.protobuf

cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ cgroupsPerQOS: true
101101
clusterDNS:
102102
- 10.192.0.10
103103
clusterDomain: cluster.global
104-
configMapAndSecretChangeDetectionStrategy: Watch
104+
configMapAndSecretChangeDetectionStrategy: Cache
105105
containerLogMaxFiles: 5
106106
containerLogMaxSize: 10Mi
107107
contentType: application/vnd.kubernetes.protobuf

pkg/kubelet/apis/config/v1beta1/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
215215
obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5)
216216
}
217217
if obj.ConfigMapAndSecretChangeDetectionStrategy == "" {
218-
obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.WatchChangeDetectionStrategy
218+
obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.TTLCacheChangeDetectionStrategy
219219
}
220220
if obj.EnforceNodeAllocatable == nil {
221221
obj.EnforceNodeAllocatable = DefaultNodeAllocatableEnforcement

0 commit comments

Comments
 (0)