Merge pull request #360 from openshift-cherrypick-robot/cherry-pick-3…

…59-to-release-4.14 [release-4.14] OCPBUGS-20409: drop the Overlay setting from transient mounts
openshift · Oct 11, 2023 · 5cedc85 · 5cedc85
2 parents b79bcf7 + 2348713
commit 5cedc85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/pkg/build/builder/daemonless.go b/pkg/build/builder/daemonless.go
@@ -422,10 +422,9 @@ func appendRHRepoMount(pathStart string, mountsMap *TransientMounts) error {
 		Source:      filepath.Join(tmpDir, repoFile),
 		Destination: filepath.Join("/run/secrets", repoFile),
 		Options: TransientMountOptions{
-			NoDev:   true,
-			NoExec:  true,
-			NoSuid:  true,
-			Overlay: true,
+			NoDev:  true,
+			NoExec: true,
+			NoSuid: true,
 		},
 	})
 }
@@ -462,10 +461,9 @@ func coreAppendSecretLinksToDirs(pathStart, pathEnd string, mountsMap *Transient
 		Destination: filepath.Join("/run/secrets", pathEnd),
 		Source:      tmpDir,
 		Options: TransientMountOptions{
-			NoDev:   true,
-			NoExec:  true,
-			NoSuid:  true,
-			Overlay: true,
+			NoDev:  true,
+			NoExec: true,
+			NoSuid: true,
 		},
 	})
 }
@@ -511,7 +509,6 @@ func appendCATrustMount(mountsMap *TransientMounts) error {
 		Source:      "/etc/pki/ca-trust",
 		Options: TransientMountOptions{
 			ReadOnly: &t,
-			Overlay:  true,
 		},
 	})
 }

diff --git a/pkg/build/builder/daemonless_test.go b/pkg/build/builder/daemonless_test.go
@@ -705,7 +705,7 @@ func TestAppendCATrustMount(t *testing.T) {
 			if tc.expectMount && len(mounts) == 0 {
 				t.Fatal("expected mount for /etc/pki/ca-trust")
 			}
-			expectedMount := "/etc/pki/ca-trust:/etc/pki/ca-trust:O,ro"
+			expectedMount := "/etc/pki/ca-trust:/etc/pki/ca-trust:ro"
 			if tc.expectMount && mounts[0] != expectedMount {
 				t.Errorf("expected mount %q, got %q", expectedMount, mounts[0])
 			}