Merge pull request #1800 from skitt/unusable-cache-dir

k8s-ci-robot · web-flow · commit adc9fa962501 · 2022-04-05T09:24:38.000-07:00
Try a temporary directory if the user cache fails
diff --git a/pkg/internal/testing/addr/manager.go b/pkg/internal/testing/addr/manager.go
@@ -43,11 +43,17 @@ var (
 
 func init() {
 	baseDir, err := os.UserCacheDir()
+	if err == nil {
+		cacheDir = filepath.Join(baseDir, "kubebuilder-envtest")
+		err = os.MkdirAll(cacheDir, 0o750)
+	}
 	if err != nil {
+		// Either we didn't get a cache directory, or we can't use it
 		baseDir = os.TempDir()
+		cacheDir = filepath.Join(baseDir, "kubebuilder-envtest")
+		err = os.MkdirAll(cacheDir, 0o750)
 	}
-	cacheDir = filepath.Join(baseDir, "kubebuilder-envtest")
-	if err := os.MkdirAll(cacheDir, 0750); err != nil {
+	if err != nil {
 		panic(err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,17 @@ var (`
`43`	`43`
`44`	`44`	`func init() {`
`45`	`45`	`baseDir, err := os.UserCacheDir()`
	`46`	`+ if err == nil {`
	`47`	`+ cacheDir = filepath.Join(baseDir, "kubebuilder-envtest")`
	`48`	`+ err = os.MkdirAll(cacheDir, 0o750)`
	`49`	`+ }`
`46`	`50`	`if err != nil {`
	`51`	`+ // Either we didn't get a cache directory, or we can't use it`
`47`	`52`	`baseDir = os.TempDir()`
	`53`	`+ cacheDir = filepath.Join(baseDir, "kubebuilder-envtest")`
	`54`	`+ err = os.MkdirAll(cacheDir, 0o750)`
`48`	`55`	`}`
`49`		`- cacheDir = filepath.Join(baseDir, "kubebuilder-envtest")`
`50`		`- if err := os.MkdirAll(cacheDir, 0750); err != nil {`
	`56`	`+ if err != nil {`
`51`	`57`	`panic(err)`
`52`	`58`	`}`
`53`	`59`	`}`