Fix restore init-container security context

tamalsaha · tamalsaha · commit 13824559bdb9 · 2025-05-14T09:39:31.000-07:00
Signed-off-by: Tamal Saha &lt;tamal@appscode.com&gt;
diff --git a/pkg/util/kubernetes.go b/pkg/util/kubernetes.go
@@ -124,6 +124,9 @@ func UpsertSecurityContext(currentSC, newSC *core.SecurityContext) *core.Securit
 	if newSC.SELinuxOptions != nil {
 		finalSC.SELinuxOptions = newSC.SELinuxOptions
 	}
+	if newSC.WindowsOptions != nil {
+		finalSC.WindowsOptions = newSC.WindowsOptions
+	}
 	if newSC.RunAsUser != nil {
 		finalSC.RunAsUser = newSC.RunAsUser
 	}
@@ -142,7 +145,12 @@ func UpsertSecurityContext(currentSC, newSC *core.SecurityContext) *core.Securit
 	if newSC.ProcMount != nil {
 		finalSC.ProcMount = newSC.ProcMount
 	}
-
+	if newSC.SeccompProfile != nil {
+		finalSC.SeccompProfile = newSC.SeccompProfile
+	}
+	if newSC.AppArmorProfile != nil {
+		finalSC.AppArmorProfile = newSC.AppArmorProfile
+	}
 	return finalSC
 }
 

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,9 @@ func UpsertSecurityContext(currentSC, newSC core.SecurityContext) core.Securit`
`124`	`124`	`if newSC.SELinuxOptions != nil {`
`125`	`125`	`finalSC.SELinuxOptions = newSC.SELinuxOptions`
`126`	`126`	`}`
	`127`	`+ if newSC.WindowsOptions != nil {`
	`128`	`+ finalSC.WindowsOptions = newSC.WindowsOptions`
	`129`	`+ }`
`127`	`130`	`if newSC.RunAsUser != nil {`
`128`	`131`	`finalSC.RunAsUser = newSC.RunAsUser`
`129`	`132`	`}`
`@@ -142,7 +145,12 @@ func UpsertSecurityContext(currentSC, newSC core.SecurityContext) core.Securit`
`142`	`145`	`if newSC.ProcMount != nil {`
`143`	`146`	`finalSC.ProcMount = newSC.ProcMount`
`144`	`147`	`}`
`145`		`-`
	`148`	`+ if newSC.SeccompProfile != nil {`
	`149`	`+ finalSC.SeccompProfile = newSC.SeccompProfile`
	`150`	`+ }`
	`151`	`+ if newSC.AppArmorProfile != nil {`
	`152`	`+ finalSC.AppArmorProfile = newSC.AppArmorProfile`
	`153`	`+ }`
`146`	`154`	`return finalSC`
`147`	`155`	`}`
`148`	`156`