Ignore container name remap annotations during spec validation.

Such annotations are *expected* to change, that's the point of the remap.
There is extra code in the restore process that verifies that the same
container names are defined in these annotations, so no further
re-verification of this is necessary at this stage.

PiperOrigin-RevId: 756989545

Author: EtiennePerot

runsc/container/container_test.go

@@ -3836,6 +3836,18 @@ func TestSpecValidation(t *testing.T) {
 			},
 			wantErr: "",
 		},
+		{
+			name: "AnnotationsContainerNameRemapIgnored",
+			mutate: func(spec, restoreSpec *specs.Spec, _, _ string) {
+				spec.Annotations = make(map[string]string)
+				spec.Annotations["dev.gvisor.dev.gvisor.container-name-remap.1"] = "name1"
+
+				restoreSpec.Annotations = make(map[string]string)
+				restoreSpec.Annotations["dev.gvisor.dev.gvisor.container-name-remap.1"] = "name2"
+				restoreSpec.Annotations["dev.gvisor.dev.gvisor.container-name-remap.asdf"] = "foobar"
+			},
+			wantErr: "",
+		},
 		{
 			name: "AnnotationsFail",
 			mutate: func(spec, restoreSpec *specs.Spec, _, _ string) {

runsc/specutils/restore.go

@@ -136,14 +136,15 @@ func validateDevices(field, cName string, o, n []specs.LinuxDevice) error {
 
 func extractAnnotationsToValidate(o map[string]string) map[string]string {
 	const (
-		gvisorPrefix   = "dev.gvisor."
-		internalPrefix = "dev.gvisor.internal."
-		mntPrefix      = "dev.gvisor.spec.mount."
+		gvisorPrefix             = "dev.gvisor."
+		internalPrefix           = "dev.gvisor.internal."
+		mntPrefix                = "dev.gvisor.spec.mount."
+		containerNameRemapPrefix = "dev.gvisor.container-name-remap."
 	)
 
 	n := make(map[string]string)
 	for key, val := range o {
-		if strings.HasPrefix(key, internalPrefix) || (strings.HasPrefix(key, mntPrefix) && strings.HasSuffix(key, ".source")) {
+		if strings.HasPrefix(key, internalPrefix) || strings.HasPrefix(key, containerNameRemapPrefix) || (strings.HasPrefix(key, mntPrefix) && strings.HasSuffix(key, ".source")) {
 			continue
 		}