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

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

Merge pull request #36375 from dims/fix-issue-36350
9b1d99ca · Kubernetes Submit Queue · GitHub · 6515e357 · 19ace3cd · 9b1d99ca
Commit 9b1d99ca authored Nov 09, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

defaults.go pkg/apis/componentconfig/v1alpha1/defaults.go +1 -1

No files found.
--- a/pkg/apis/componentconfig/v1alpha1/defaults.go
+++ b/pkg/apis/componentconfig/v1alpha1/defaults.go
@@ -340,7 +340,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
 		obj.SerializeImagePulls = boolVar(true)
 	}
 	if obj.SeccompProfileRoot == "" {
-		filepath.Join(defaultRootDir, "seccomp")
+		obj.SeccompProfileRoot = filepath.Join(defaultRootDir, "seccomp")
 	}
 	if obj.StreamingConnectionIdleTimeout == zeroDuration {
 		obj.StreamingConnectionIdleTimeout = unversioned.Duration{Duration: 4 * time.Hour}