Merge pull request kubernetes#23438 from oxkrypton/fix/nerdctl-bin-tabs

fix: replace spaces with tabs in nerdctl-bin Buildroot package files

Author: nirs

Makefile

@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
 HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.38.0-1786530282-23482
+ISO_VERSION ?= v1.38.0-1786724147-23438
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/Config.in

@@ -1,4 +1,4 @@
 config BR2_PACKAGE_NERDCTL_BIN_AARCH64
-        bool "nerdctl-bin"
-        default y
-        depends on BR2_aarch64
+	bool "nerdctl-bin"
+	default y
+	depends on BR2_aarch64

deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk

@@ -11,9 +11,9 @@ NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.
 NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0
 
 define NERDCTL_BIN_AARCH64_INSTALL_TARGET_CMDS
-        $(INSTALL) -D -m 0755 \
-                $(@D)/nerdctl \
-                $(TARGET_DIR)/usr/bin/nerdctl
+	$(INSTALL) -D -m 0755 \
+		$(@D)/nerdctl \
+		$(TARGET_DIR)/usr/bin/nerdctl
 endef
 
 $(eval $(generic-package))

deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/Config.in

@@ -1,4 +1,4 @@
 config BR2_PACKAGE_NERDCTL_BIN
-        bool "nerdctl-bin"
-        default y
-        depends on BR2_x86_64
+	bool "nerdctl-bin"
+	default y
+	depends on BR2_x86_64

deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk

@@ -11,9 +11,9 @@ NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz
 NERDCTL_BIN_STRIP_COMPONENTS = 0
 
 define NERDCTL_BIN_INSTALL_TARGET_CMDS
-        $(INSTALL) -D -m 0755 \
-                $(@D)/nerdctl \
-                $(TARGET_DIR)/usr/bin/nerdctl
+	$(INSTALL) -D -m 0755 \
+		$(@D)/nerdctl \
+		$(TARGET_DIR)/usr/bin/nerdctl
 endef
 
 $(eval $(generic-package))

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-builds/iso/23482"
+	isoBucket := "minikube-builds/iso/23438"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),