Merge pull request #10945 from Luap99/rootless-cni-v3.2

[v3.2] Backport rootless cni fixes
containers · Jul 15, 2021 · 2eea7fe · 2eea7fe
2 parents 4136f8b + 1a8b2a0
commit 2eea7fe
Show file tree

Hide file tree

Showing 3 changed files with 282 additions and 199 deletions.
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
@@ -173,7 +173,7 @@ function _run_swagger() {
     trap "rm -f $envvarsfile" EXIT  # contains secrets
     # Warning: These values must _not_ be quoted, podman will not remove them.
     #shellcheck disable=SC2154
-    cat <<eof>>$envvarsfile
+    cat <<eof >>$envvarsfile
 GCPJSON=$GCPJSON
 GCPNAME=$GCPNAME
 GCPPROJECT=$GCPPROJECT
@@ -334,6 +334,11 @@ msg "************************************************************"
 
 # shellcheck disable=SC2154
 if [[ "$PRIV_NAME" == "rootless" ]] && [[ "$UID" -eq 0 ]]; then
+    # Remove /var/lib/cni, it is not required for rootless cni.
+    # We have to test that it works without this directory.
+    # https://github.com/containers/podman/issues/10857
+    rm -rf /var/lib/cni
+
     req_env_vars ROOTLESS_USER
     msg "Re-executing runner through ssh as user '$ROOTLESS_USER'"
     msg "************************************************************"