Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f2a0c034
Commit
f2a0c034
authored
Mar 13, 2019
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Revert kubelet to default to ttl cache secret/configmap behavior"
This reverts commit
cd1c9f90
.
parent
9cd57a5a
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
4 deletions
+20
-4
defaulted.yaml
...il/config/testdata/defaulting/controlplane/defaulted.yaml
+1
-1
defaulted_non_linux.yaml
...testdata/defaulting/controlplane/defaulted_non_linux.yaml
+1
-1
defaults.go
pkg/kubelet/apis/config/v1beta1/defaults.go
+1
-1
main_test.go
test/integration/kubelet/main_test.go
+1
-1
watch_manager_test.go
test/integration/kubelet/watch_manager_test.go
+16
-0
No files found.
cmd/kubeadm/app/util/config/testdata/defaulting/controlplane/defaulted.yaml
View file @
f2a0c034
...
@@ -101,7 +101,7 @@ cgroupsPerQOS: true
...
@@ -101,7 +101,7 @@ cgroupsPerQOS: true
clusterDNS
:
clusterDNS
:
-
10.192.0.10
-
10.192.0.10
clusterDomain
:
cluster.global
clusterDomain
:
cluster.global
configMapAndSecretChangeDetectionStrategy
:
Cache
configMapAndSecretChangeDetectionStrategy
:
Watch
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/controlplane/defaulted_non_linux.yaml
View file @
f2a0c034
...
@@ -101,7 +101,7 @@ cgroupsPerQOS: true
...
@@ -101,7 +101,7 @@ cgroupsPerQOS: true
clusterDNS
:
clusterDNS
:
-
10.192.0.10
-
10.192.0.10
clusterDomain
:
cluster.global
clusterDomain
:
cluster.global
configMapAndSecretChangeDetectionStrategy
:
Cache
configMapAndSecretChangeDetectionStrategy
:
Watch
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 @
f2a0c034
...
@@ -215,7 +215,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
...
@@ -215,7 +215,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
.
TTLCache
ChangeDetectionStrategy
obj
.
ConfigMapAndSecretChangeDetectionStrategy
=
kubeletconfigv1beta1
.
Watch
ChangeDetectionStrategy
}
}
if
obj
.
EnforceNodeAllocatable
==
nil
{
if
obj
.
EnforceNodeAllocatable
==
nil
{
obj
.
EnforceNodeAllocatable
=
DefaultNodeAllocatableEnforcement
obj
.
EnforceNodeAllocatable
=
DefaultNodeAllocatableEnforcement
...
...
test/integration/kubelet/main_test.go
View file @
f2a0c034
/*
/*
Copyright 201
7
The Kubernetes Authors.
Copyright 201
9
The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
you may not use this file except in compliance with the License.
...
...
test/integration/kubelet/watch_manager_test.go
View file @
f2a0c034
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
kubelet
package
kubelet
import
(
import
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment