Merge pull request #15565 from mqasimsarfraz/qasim/upgrade-podman

ISO: Upgrade podman to 3.4.7

Author: spowelljr

Makefile

@@ -24,7 +24,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.29.0
+ISO_VERSION ?= v1.29.0-1674856271-15565
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/package/podman/podman.hash

@@ -4,3 +4,4 @@ sha256 ec5473e51fa28f29af323473fc484f742dc7df23d06d8ba9f217f13382893a71 v2.2.0.t
 sha256 3212bad60d945c1169b27da03959f36d92d1d8964645c701a5a82a89118e96d1 v2.2.1.tar.gz
 sha256 5a0d42e03d15e32c5c54a147da5ef1b8928ec00982ac9e3f1edc82c5e614b6d2 v3.1.2.tar.gz
 sha256 b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31 v3.4.2.tar.gz
+sha256 4af6606dd072fe946960680611ba65201be435b43edbfc5cc635b2a01a899e6e v3.4.7.tar.gz

deploy/iso/minikube-iso/package/podman/podman.mk

@@ -1,5 +1,5 @@
-PODMAN_VERSION = v3.4.2
-PODMAN_COMMIT = 2ad1fd3555de12de34e20898cc2ef901f08fe5ed
+PODMAN_VERSION = v3.4.7
+PODMAN_COMMIT = 74d67f5d43bcd322a4fb11a7b58eced866f9d0b9
 PODMAN_SITE = https://github.com/containers/podman/archive
 PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz
 PODMAN_LICENSE = Apache-2.0

pkg/minikube/download/iso.go

@@ -41,7 +41,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube/iso"
+	isoBucket := "minikube-builds/iso/15565"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),