Merge pull request openshift#2032 from openshift-cherrypick-robot/cherry-pick-2031-to-release-4.19

openshift-merge-bot[bot] · web-flow · commit fa1fd955cefa · 2025-06-16T16:36:25.000Z
[release-4.19] OCPBUGS-56905: avoid transfering permissions when copying artifacts from node-joiner pod
diff --git a/pkg/cli/admin/nodeimage/create.go b/pkg/cli/admin/nodeimage/create.go
@@ -378,6 +378,7 @@ func (o *CreateOptions) copyArtifactsFromNodeJoinerPod() error {
 		Quiet:         true,
 		RsyncInclude:  []string{"*.iso"},
 		RsyncExclude:  []string{"*"},
+		RsyncNoPerms:  true,
 	}
 	if o.GeneratePXEFiles {
 		rsyncOptions.Source.Path = "/assets/boot-artifacts/"
diff --git a/pkg/cli/admin/nodeimage/create_test.go b/pkg/cli/admin/nodeimage/create_test.go
@@ -309,6 +309,9 @@ func TestRun(t *testing.T) {
 				if fakeCp.options.Destination.Path != tc.assetsDir {
 					t.Errorf("expected %v, actual %v", fakeCp.options.Destination.Path, tc.assetsDir)
 				}
+				if fakeCp.options.RsyncNoPerms == false {
+					t.Errorf("RsyncNoPerms is disabled")
+				}
 			}
 
 			for _, ext := range tc.expectedRsyncInclude {

Original file line number	Diff line number	Diff line change
`@@ -378,6 +378,7 @@ func (o *CreateOptions) copyArtifactsFromNodeJoinerPod() error {`
`378`	`378`	`Quiet: true,`
`379`	`379`	`RsyncInclude: []string{"*.iso"},`
`380`	`380`	`RsyncExclude: []string{"*"},`
	`381`	`+ RsyncNoPerms: true,`
`381`	`382`	`}`
`382`	`383`	`if o.GeneratePXEFiles {`
`383`	`384`	`rsyncOptions.Source.Path = "/assets/boot-artifacts/"`
Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,9 @@ func TestRun(t *testing.T) {`
`309`	`309`	`if fakeCp.options.Destination.Path != tc.assetsDir {`
`310`	`310`	`t.Errorf("expected %v, actual %v", fakeCp.options.Destination.Path, tc.assetsDir)`
`311`	`311`	`}`
	`312`	`+ if fakeCp.options.RsyncNoPerms == false {`
	`313`	`+ t.Errorf("RsyncNoPerms is disabled")`
	`314`	`+ }`
`312`	`315`	`}`
`313`	`316`
`314`	`317`	`for _, ext := range tc.expectedRsyncInclude {`