github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36375 from dims/fix-issue-36350

Browse Source 
Automatic merge from submit-queue

Fix default Seccomp profile directory

Looks like some of the refactoring caused us to lose the default
directory. Setting that explicitly here.

Fixes #36350
This commit is contained in:
Kubernetes Submit Queue 2016-11-09 03:13:42 -08:00 committed by GitHub
commit 9b1d99ca46
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/componentconfig/v1alpha1/defaults.go
View File

@ -340,7 +340,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.SerializeImagePulls = boolVar(true) obj.SerializeImagePulls = boolVar(true)
} }
if obj.SeccompProfileRoot == "" { if obj.SeccompProfileRoot == "" {
filepath.Join(defaultRootDir, "seccomp") obj.SeccompProfileRoot = filepath.Join(defaultRootDir, "seccomp")
} }
if obj.StreamingConnectionIdleTimeout == zeroDuration { if obj.StreamingConnectionIdleTimeout == zeroDuration {
obj.StreamingConnectionIdleTimeout = unversioned.Duration{Duration: 4 * time.Hour} obj.StreamingConnectionIdleTimeout = unversioned.Duration{Duration: 4 * time.Hour}