Skip to content

K
k3s
Unverified Commit da367285 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #74841 from liggitt/automated-cherry-pick-of-#74755-upstream-release-1.13

Automated cherry pick of #74755: Revert kubelet to default to ttl cache secret/configmap
parents 06c4ecc4 3ba07248
Show 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 @ da367285
...@@ -92,7 +92,7 @@ ComponentConfigs: ...@@ -92,7 +92,7 @@ ComponentConfigs:
ClusterDNS: ClusterDNS:
- 10.96.0.10 - 10.96.0.10
ClusterDomain: cluster.local ClusterDomain: cluster.local
ConfigMapAndSecretChangeDetectionStrategy: Watch ConfigMapAndSecretChangeDetectionStrategy: Cache
ContainerLogMaxFiles: 5 ContainerLogMaxFiles: 5
ContainerLogMaxSize: 10Mi ContainerLogMaxSize: 10Mi
ContentType: application/vnd.kubernetes.protobuf ContentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1alpha3.yaml
View file @ da367285
...@@ -110,7 +110,7 @@ cgroupsPerQOS: true ...@@ -110,7 +110,7 @@ cgroupsPerQOS: true
clusterDNS: clusterDNS:
- 10.96.0.10 - 10.96.0.10
clusterDomain: cluster.local clusterDomain: cluster.local
configMapAndSecretChangeDetectionStrategy: Watch configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5 containerLogMaxFiles: 5
containerLogMaxSize: 10Mi containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf contentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1.yaml
View file @ da367285
...@@ -111,7 +111,7 @@ cgroupsPerQOS: true ...@@ -111,7 +111,7 @@ cgroupsPerQOS: true
clusterDNS: clusterDNS:
- 10.96.0.10 - 10.96.0.10
clusterDomain: cluster.local clusterDomain: cluster.local
configMapAndSecretChangeDetectionStrategy: Watch configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5 containerLogMaxFiles: 5
containerLogMaxSize: 10Mi containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf contentType: application/vnd.kubernetes.protobuf
......
cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml
View file @ da367285
...@@ -97,7 +97,7 @@ cgroupsPerQOS: true ...@@ -97,7 +97,7 @@ cgroupsPerQOS: true
clusterDNS: clusterDNS:
- 10.192.0.10 - 10.192.0.10
clusterDomain: cluster.global clusterDomain: cluster.global
configMapAndSecretChangeDetectionStrategy: Watch configMapAndSecretChangeDetectionStrategy: Cache
containerLogMaxFiles: 5 containerLogMaxFiles: 5
containerLogMaxSize: 10Mi containerLogMaxSize: 10Mi
contentType: application/vnd.kubernetes.protobuf contentType: application/vnd.kubernetes.protobuf
......
pkg/kubelet/apis/config/v1beta1/defaults.go
View file @ da367285
...@@ -214,7 +214,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura ...@@ -214,7 +214,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5) obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5)
} }
if obj.ConfigMapAndSecretChangeDetectionStrategy == "" { if obj.ConfigMapAndSecretChangeDetectionStrategy == "" {
obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.WatchChangeDetectionStrategy obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.TTLCacheChangeDetectionStrategy
} }
if obj.EnforceNodeAllocatable == nil { if obj.EnforceNodeAllocatable == nil {
obj.EnforceNodeAllocatable = DefaultNodeAllocatableEnforcement 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