Skip to content

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

Revert kubelet to default to ttl cache secret/configmap behavior

parent 9e71ab4d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml
View file @ 3ba07248
......@@ -92,7 +92,7 @@ ComponentConfigs:
ClusterDNS:
- 10.96.0.10
ClusterDomain: cluster.local
ConfigMapAndSecretChangeDetectionStrategy: Watch
ConfigMapAndSecretChangeDetectionStrategy: Cache
ContainerLogMaxFiles: 5
ContainerLogMaxSize: 10Mi
ContentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml
View file @ 3ba07248
......@@ -110,7 +110,7 @@ cgroupsPerQOS: true
clusterDNS:
- 10.96.0.10
clusterDomain: cluster.local
configMapAndSecretChangeDetectionStrategy: Watch
configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5
containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1.yaml
View file @ 3ba07248
......@@ -111,7 +111,7 @@ cgroupsPerQOS: true
clusterDNS:
- 10.96.0.10
clusterDomain: cluster.local
configMapAndSecretChangeDetectionStrategy: Watch
configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5
containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml
View file @ 3ba07248
......@@ -97,7 +97,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 @ 3ba07248
......@@ -214,7 +214,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