github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110813 from vpnachev/apiserver/create-dir-for-audit-log-path

Browse Source 
Ensure the directory for the file in flag `--audit-log-path` exists
This commit is contained in:
Kubernetes Prow Robot 2022-07-18 09:35:15 -07:00 committed by GitHub
commit ff20035ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/server/options/audit.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"path/filepath"
"strings" "strings"
"time" "time"
@ -525,6 +526,9 @@ func (o *AuditLogOptions) getWriter() (io.Writer, error) {
} }
func (o *AuditLogOptions) ensureLogFile() error { func (o *AuditLogOptions) ensureLogFile() error {
if err := os.MkdirAll(filepath.Dir(o.Path), 0700); err != nil {
return err
}
mode := os.FileMode(0600) mode := os.FileMode(0600)
f, err := os.OpenFile(o.Path, os.O_CREATE|os.O_APPEND|os.O_RDWR, mode) f, err := os.OpenFile(o.Path, os.O_CREATE|os.O_APPEND|os.O_RDWR, mode)
if err != nil { if err != nil {

9
staging/src/k8s.io/apiserver/pkg/server/options/audit_test.go
View File

@ -69,6 +69,15 @@ func TestAuditValidOptions(t *testing.T) {
return o return o
}, },
expected: "ignoreErrors<log>", expected: "ignoreErrors<log>",
}, {
name: "create audit log path dir",
options: func() *AuditOptions {
o := NewAuditOptions()
o.LogOptions.Path = filepath.Join(tmpDir, "non-existing-dir1", "non-existing-dir2", "audit")
o.PolicyFile = policy
return o
},
expected: "ignoreErrors<log>",
}, { }, {
name: "default log no policy", name: "default log no policy",
options: func() *AuditOptions { options: func() *AuditOptions {