From cd1c9f9018b5d03370e7277c6961efa69a64ee4b Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 28 Feb 2019 17:33:57 -0500 Subject: [PATCH] Revert kubelet to default to ttl cache secret/configmap behavior --- .../util/config/testdata/defaulting/controlplane/defaulted.yaml | 2 +- .../testdata/defaulting/controlplane/defaulted_non_linux.yaml | 2 +- pkg/kubelet/apis/config/v1beta1/defaults.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml index 813b161c93..4ea43b5fdd 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml +++ b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml @@ -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 diff --git a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml index c3124af1f7..5e4833c3ec 100644 --- a/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml +++ b/cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted_non_linux.yaml @@ -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 diff --git a/pkg/kubelet/apis/config/v1beta1/defaults.go b/pkg/kubelet/apis/config/v1beta1/defaults.go index 8c1568e91e..451169f289 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults.go @@ -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