Use uncompressed kubelet log file permissions when compressed.

simonfogliato · simonfogliato · commit 3de770d59858 · 2025-02-04T08:37:05.000-08:00
diff --git a/pkg/kubelet/logs/container_log_manager.go b/pkg/kubelet/logs/container_log_manager.go
@@ -418,8 +418,12 @@ func (c *containerLogManager) compressLog(log string) error {
 		return fmt.Errorf("failed to open log %q: %v", log, err)
 	}
 	defer r.Close()
+	logInfo, err := os.Stat(log)
+	if err != nil {
+		return fmt.Errorf("failed to get log info %q: %v", log, err)
+	}
 	tmpLog := log + tmpSuffix
-	f, err := c.osInterface.OpenFile(tmpLog, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	f, err := c.osInterface.OpenFile(tmpLog, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, logInfo.Mode())
 	if err != nil {
 		return fmt.Errorf("failed to create temporary log %q: %v", tmpLog, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -418,8 +418,12 @@ func (c *containerLogManager) compressLog(log string) error {`
`418`	`418`	`return fmt.Errorf("failed to open log %q: %v", log, err)`
`419`	`419`	`}`
`420`	`420`	`defer r.Close()`
	`421`	`+ logInfo, err := os.Stat(log)`
	`422`	`+ if err != nil {`
	`423`	`+ return fmt.Errorf("failed to get log info %q: %v", log, err)`
	`424`	`+ }`
`421`	`425`	`tmpLog := log + tmpSuffix`
`422`		`- f, err := c.osInterface.OpenFile(tmpLog, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, 0644)`
	`426`	`+ f, err := c.osInterface.OpenFile(tmpLog, os.O_WRONLY\|os.O_CREATE\|os.O_TRUNC, logInfo.Mode())`
`423`	`427`	`if err != nil {`
`424`	`428`	`return fmt.Errorf("failed to create temporary log %q: %v", tmpLog, err)`
`425`	`429`	`}`