[release/1.7]: HPC working directory fix in pkg/cri/server code

anmaxvl · anmaxvl · commit 33b62936ea56 · 2024-06-06T12:31:54.000-07:00
Change in 989f1ec assumed a single place (pkg/cri/sbserver) where this had to be fixed. Commit in main branch for reference: (cherry picked from commit c7ea06a) Signed-off-by: Maksim An <maksiman@microsoft.com>
diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go
@@ -67,6 +67,8 @@ func (c *criService) containerSpec(
 		specOpts = append(specOpts, oci.WithProcessCwd(config.GetWorkingDir()))
 	} else if imageConfig.WorkingDir != "" {
 		specOpts = append(specOpts, oci.WithProcessCwd(imageConfig.WorkingDir))
+	} else if cntrHpc {
+		specOpts = append(specOpts, oci.WithProcessCwd(`C:\hpc`))
 	}
 
 	if config.GetTty() {

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ func (c *criService) containerSpec(`
`67`	`67`	`specOpts = append(specOpts, oci.WithProcessCwd(config.GetWorkingDir()))`
`68`	`68`	`} else if imageConfig.WorkingDir != "" {`
`69`	`69`	`specOpts = append(specOpts, oci.WithProcessCwd(imageConfig.WorkingDir))`
	`70`	`+ } else if cntrHpc {`
	`71`	+ specOpts = append(specOpts, oci.WithProcessCwd(`C:\hpc`))
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`if config.GetTty() {`