cmd/root: randomize pivot container name

This is a backport of
openshift/machine-config-operator#1285, which
for the 4.1 release should live here since we were still using the
separate pivot package.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1783621

Original cherry-picked commit message:

If podman has a bug and cannot cleanup container names, we'll be stuck
in the update process as seen in
https://bugzilla.redhat.com/show_bug.cgi?id=1775647.
Randomize container names with UUID to avoid that and I think it's
generally better to do this w/o cleaning up at the beginning every time.

Signed-off-by: Antonio Murdaca <runcom@linux.com>

cmd/root.go

@@ -17,6 +17,7 @@ import (
 	"github.com/openshift/pivot/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/util/uuid"
 
 	imgref "github.com/containers/image/docker/reference"
 )
@@ -307,11 +308,18 @@ func pullAndRebase(container string) (imgid string, changed bool) {
 		imgid = container
 	}
 
-	// Clean up a previous container
-	podmanRemove(types.PivotName)
+	// Clean up any previous container which used the old name
+	podmanRemove(types.OldPivotName)
+
+	containerName := types.PivotNamePrefix + string(uuid.NewUUID())
 
 	// `podman mount` wants a container, so let's make create a dummy one, but not run it
-	cid := utils.RunGetOut("podman", "create", "--net=none", "--name", types.PivotName, imgid)
+	cid := utils.RunGetOut("podman", "create", "--net=none", "--annotation=org.openshift.machineconfigoperator.pivot=true", "--name", containerName, imgid)
+
+	defer func() {
+		// Kill our dummy container
+		podmanRemove(containerName)
+	}()
 	// Use the container ID to find its mount point
 	mnt := utils.RunGetOut("podman", "mount", cid)
 	repo := fmt.Sprintf("%s/srv/repo", mnt)
@@ -350,9 +358,6 @@ func pullAndRebase(container string) (imgid string, changed bool) {
 		"--custom-origin-url", customURL,
 		"--custom-origin-description", "Managed by pivot tool")
 
-	// Kill our dummy container
-	podmanRemove(types.PivotName)
-
 	changed = true
 	return
 }

types/imageinspection.go

@@ -7,8 +7,9 @@ import (
 )
 
 const (
-	// PivotName is literally the name of the new pivot
-	PivotName = "ostree-container-pivot"
+	OldPivotName    = "ostree-container-pivot"
+	// PivotNamePrefix is literally the name prefix of the new pivot
+	PivotNamePrefix = "ostree-container-pivot-"
 )
 
 // ImageInspection is a public implementation of