Merge pull request kubernetes#35149 from haircommander/crio-userns-bump

k8s-ci-robot · web-flow · commit fbde63b951f1 · 2025-07-15T19:22:23.000-07:00
crio: bump userns commit to pickup upstream fix
diff --git a/jobs/e2e_node/crio/crio_cgroupv2_userns.ign b/jobs/e2e_node/crio/crio_cgroupv2_userns.ign
@@ -62,7 +62,7 @@
         "path": "/etc/systemd/system.conf.d/10-env.conf",
         "contents": {
           "compression": "",
-          "source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D5655aea0470e126bbb0dd9a5092efb32fb4e12d1%22%0A"
+          "source": "data:,%5BManager%5D%0ADefaultEnvironment%3D%22CRIO_SCRIPT_COMMIT%3D0936ec4f6d77fba3a42432adaf8aa57b629c06cf%22%0ADefaultEnvironment%3D%22CRIO_COMMIT%3D9cdf516777eb88e515173650bf28af18a87ec23f%22%0A"
         },
         "mode": 420
       },
diff --git a/jobs/e2e_node/crio/templates/crio_cgroupv2_userns.yaml b/jobs/e2e_node/crio/templates/crio_cgroupv2_userns.yaml
@@ -33,7 +33,7 @@ storage:
         inline: |
           [Manager]
           DefaultEnvironment="CRIO_SCRIPT_COMMIT=0936ec4f6d77fba3a42432adaf8aa57b629c06cf"
-          DefaultEnvironment="CRIO_COMMIT=5655aea0470e126bbb0dd9a5092efb32fb4e12d1"
+          DefaultEnvironment="CRIO_COMMIT=9cdf516777eb88e515173650bf28af18a87ec23f"
     # Note: this ignition file assumes FCOS has shadow-utils installed.
     # As of the time of writing this, it does.
     - path: /etc/subuid
diff --git a/jobs/e2e_node/crio/templates/generate b/jobs/e2e_node/crio/templates/generate
@@ -35,7 +35,7 @@ declare -A CONFIGURATIONS=(
     ["crio_cgroupv2_imagefs"]="root env imagefs"
     ["crio_cgroupv2_splitfs"]="root env splitfs"
     ["crio_cgroupv2_hugepages"]="root env hugepages"
-    ["crio_cgroupv2_userns"]="root env userns crun-enabled"
+    ["crio_cgroupv2_userns"]="root env-canary userns crun-enabled"
 )
 
 CONTAINER_RUNTIME=$(which podman 2>/dev/null) ||

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ declare -A CONFIGURATIONS=(`
`35`	`35`	`["crio_cgroupv2_imagefs"]="root env imagefs"`
`36`	`36`	`["crio_cgroupv2_splitfs"]="root env splitfs"`
`37`	`37`	`["crio_cgroupv2_hugepages"]="root env hugepages"`
`38`		`- ["crio_cgroupv2_userns"]="root env userns crun-enabled"`
	`38`	`+ ["crio_cgroupv2_userns"]="root env-canary userns crun-enabled"`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`CONTAINER_RUNTIME=$(which podman 2>/dev/null) \|\|`