Merge pull request #1639 from afbjorklund/podman

Do the same kind of cgroup fix also for podman

images/base/files/usr/local/bin/entrypoint

@@ -70,6 +70,18 @@ fix_cgroup() {
       mount --bind "${subsystem}" "${subsystem}${docker_cgroup}"
     done
   fi
+  local podman_cgroup_mounts
+  podman_cgroup_mounts=$(grep /sys/fs/cgroup /proc/self/mountinfo | grep libpod_parent || true)
+  if [[ -n "${podman_cgroup_mounts}" ]]; then
+    local podman_cgroup cgroup_subsystems subsystem
+    podman_cgroup=$(echo "${podman_cgroup_mounts}" | head -n 1 | cut -d' ' -f 4)
+    cgroup_subsystems=$(echo "${podman_cgroup_mounts}" | cut -d' ' -f 5)
+    echo "${cgroup_subsystems}" |
+    while IFS= read -r subsystem; do
+      mkdir -p "${subsystem}${podman_cgroup}"
+      mount --bind "${subsystem}" "${subsystem}${podman_cgroup}"
+    done
+  fi
 }
 
 fix_machine_id() {

pkg/build/nodeimage/defaults.go

@@ -20,7 +20,7 @@ package nodeimage
 const DefaultImage = "kindest/node:latest"
 
 // DefaultBaseImage is the default base image used
-const DefaultBaseImage = "kindest/base:v20200530-c3e2b553"
+const DefaultBaseImage = "kindest/base:v20200531-21e528f5"
 
 // DefaultMode is the default kubernetes build mode for the built image
 // see pkg/build/kube.Bits