Merge pull request #4863 from crosbymichael/log-dir

estesp · web-flow · commit ce7024558f40 · 2020-12-18T07:06:38.000-05:00
[cri] ensure log dir is created
diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go
@@ -156,6 +156,9 @@ func (c *criService) seccompEnabled() bool {
 
 // openLogFile opens/creates a container log file.
 func openLogFile(path string) (*os.File, error) {
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		return nil, err
+	}
 	return os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0640)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,9 @@ func (c *criService) seccompEnabled() bool {`
`156`	`156`
`157`	`157`	`// openLogFile opens/creates a container log file.`
`158`	`158`	`func openLogFile(path string) (*os.File, error) {`
	`159`	`+ if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {`
	`160`	`+ return nil, err`
	`161`	`+ }`
`159`	`162`	`return os.OpenFile(path, os.O_CREATE\|os.O_APPEND\|os.O_WRONLY, 0640)`
`160`	`163`	`}`
`161`	`164`