Build(deps-dev): Bump braces from 3.0.2 to 3.0.3 in /site

.golangci.yaml

@@ -23,23 +23,8 @@ linters:
         - "-ST1020"
         - "-ST1021"
         - "-ST1022"
-        ##### TODO: fix and enable these
-        # 4 occurrences.
-        # Use fmt.Fprintf(x, ...) instead of x.Write(fmt.Sprintf(...)) https://staticcheck.dev/docs/checks#QF1012
-        - "-QF1012"
-        # 3 occurrences.
-        # Apply De Morgan’s law https://staticcheck.dev/docs/checks#QF1001
-        - "-QF1001"
-        # 9 occurrences.
-        # Convert if/else-if chain to tagged switch https://staticcheck.dev/docs/checks#QF1003
-        - "-QF1003"
-        # 1 occurrence.
-        # could omit type *os.File from declaration; it will be inferred from the right-hand side
-        - "-QF1011"
-        ##### These have been vetted to be disabled.
-        # 19 occurrences. Omit embedded fields from selector expression https://staticcheck.dev/docs/checks#QF1008
-        # Usefulness is questionable.
         - "-QF1008"
+
     revive:
       enable-all-rules: true
       rules:
@@ -150,23 +135,22 @@ linters:
       # - yodaStyleExpr
       # - typeUnparen
 
-      ##### TODO: fix and enable these
       # We enabled these and we pass
       - nilValReturn
-      # - weakCond # pkg/minikube/config/profile.go:61:9: weakCond: suspicious `cc.Nodes != nil && cc.Nodes[0].Name == node.Name`; nil check may not be enough, check for len (gocritic)
+      - weakCond 
       - indexAlloc
       - rangeExprCopy
       - boolExprSimplify
       - commentedOutImport
-      # - docStub         # pkg/minikube/tunnel/kic/service_tunnel.go:51:1: docStub: silencing go lint doc-comment warnings is unadvised (gocritic)
+      - docStub        
       - emptyFallthrough
       - hexLiteral
       - typeAssertChain
       - unlabelStmt
-      # - builtinShadow # cmd/minikube/cmd/delete.go:89:7: builtinShadow: shadowing of predeclared identifier: error (gocritic) 
-      # - importShadow # pkg/storage/storage_provisioner.go:60:2: importShadow: shadow of imported package 'path' (gocritic)
+      - builtinShadow  
+      - importShadow 
       - initClause
-      # - nestingReduce # pkg/minikube/tunnel/registry.go:94:3: nestingReduce: invert if cond, replace body with `continue`, move old body after the statement (gocritic)
+      - nestingReduce 
       - unnecessaryBlock
 
   exclusions:
@@ -181,7 +165,3 @@ linters:
       - path: '(.+)\.go$'
         text: "Error return value of `.*` is not checked"
         linter: errcheck
-      # This code is doubtful and I don't understand it. Location: Line 456
-      - path: 'cmd/minikube/cmd/docker-env.go'
-        text: "useless-break: useless break in case clause"
-        linter: revive

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.36.0
+ISO_VERSION ?= v1.36.0-1749153077-20895
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
@@ -103,7 +103,7 @@ $(shell mkdir -p $(BUILD_DIR))
 CURRENT_GIT_BRANCH ?= $(shell git branch | grep \* | cut -d ' ' -f2)
 
 # Use system python if it exists, otherwise use Docker.
-PYTHON := $(shell command -v python || echo "docker run --rm -it -v $(shell pwd):/minikube:Z -w /minikube python python")
+PYTHON := $(shell command -v python || echo "docker run --rm -it -v $(shell pwd):/minikube -w /minikube python python")
 BUILD_OS := $(shell uname -s)
 
 SHA512SUM=$(shell command -v sha512sum || echo "shasum -a 512")
@@ -189,7 +189,7 @@ endef
 
 # $(call DOCKER, image, command)
 define DOCKER
-	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app:Z -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)'
+	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app -v $(GOPATH):/go --init $(1) /bin/bash -c '$(2)'
 endef
 
 ifeq ($(BUILD_IN_DOCKER),y)
@@ -341,13 +341,13 @@ out/minikube-%.iso: $(shell find "deploy/iso/minikube-iso" -type f)
 ifeq ($(IN_DOCKER),1)
 	$(MAKE) minikube-iso-$*
 else
-	docker run --rm --workdir /mnt --volume $(CURDIR):/mnt:Z $(ISO_DOCKER_EXTRA_ARGS) \
+	docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \
 		--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
 		$(ISO_BUILD_IMAGE) /bin/bash -lc '/usr/bin/make minikube-iso-$*'
 endif
 
 iso_in_docker:
-	docker run -it --rm --workdir /mnt --volume $(CURDIR):/mnt:Z $(ISO_DOCKER_EXTRA_ARGS) \
+	docker run -it --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \
 		--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
 		$(ISO_BUILD_IMAGE) /bin/bash
 
@@ -523,7 +523,7 @@ out/linters/golangci-lint-$(GOLINT_VERSION):
 .PHONY: lint
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 lint:
-	docker run --rm -v `pwd`:/app:Z -w /app golangci/golangci-lint:$(GOLINT_VERSION) \
+	docker run --rm -v `pwd`:/app -w /app golangci/golangci-lint:$(GOLINT_VERSION) \
 	golangci-lint run ${GOLINT_OPTIONS} ./..." 
 	# --skip-dirs "cmd/drivers/kvm|cmd/drivers/hyperkit|pkg/drivers/kvm|pkg/drivers/hyperkit" 
 	# The "--skip-dirs" parameter is no longer supported in the V2 version. If you need to skip the directory, 
@@ -657,7 +657,7 @@ out/docker-machine-driver-hyperkit:
 ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 \
 		--user $(shell id -u):$(shell id -g) -w /app \
-		-v $(PWD):/app:Z -v $(GOPATH):/go:Z --init --entrypoint "" \
+		-v $(PWD):/app -v $(GOPATH):/go --init --entrypoint "" \
 		$(HYPERKIT_BUILD_IMAGE) /bin/bash -c 'CC=o64-clang CXX=o64-clang++ /usr/bin/make $@'
 else
 	$(if $(quiet),@echo "  GO       $@")

OWNERS

@@ -3,7 +3,6 @@
 reviewers:
   - medyagh
   - prezha
-  - spowelljr
   - comradeprogrammer
 approvers:
   - medyagh

cmd/minikube/cmd/completion.go

@@ -162,7 +162,7 @@ func GenerateBashCompletion(w io.Writer, cmd *cobra.Command) error {
 }
 
 // GenerateZshCompletion generates the completion for the zsh shell
-func GenerateZshCompletion(out io.Writer, cmd *cobra.Command) error {
+func GenerateZshCompletion(w io.Writer, cmd *cobra.Command) error {
 	zshAutoloadTag := `#compdef minikube
 `
 
@@ -300,17 +300,17 @@ __minikube_convert_bash_to_zsh() {
 	<<'BASH_COMPLETION_EOF'
 `
 
-	_, err := out.Write([]byte(zshAutoloadTag))
+	_, err := w.Write([]byte(zshAutoloadTag))
 	if err != nil {
 		return err
 	}
 
-	_, err = out.Write([]byte(boilerPlate))
+	_, err = w.Write([]byte(boilerPlate))
 	if err != nil {
 		return err
 	}
 
-	_, err = out.Write([]byte(zshInitialization))
+	_, err = w.Write([]byte(zshInitialization))
 	if err != nil {
 		return err
 	}
@@ -320,7 +320,7 @@ __minikube_convert_bash_to_zsh() {
 	if err != nil {
 		return errors.Wrap(err, "Error generating zsh completion")
 	}
-	_, err = out.Write(buf.Bytes())
+	_, err = w.Write(buf.Bytes())
 	if err != nil {
 		return err
 	}
@@ -330,7 +330,7 @@ BASH_COMPLETION_EOF
 }
 __minikube_bash_source <(__minikube_convert_bash_to_zsh)
 `
-	_, err = out.Write([]byte(zshTail))
+	_, err = w.Write([]byte(zshTail))
 	if err != nil {
 		return err
 	}

cmd/minikube/cmd/config/configure.go

@@ -133,7 +133,7 @@ func loadAddonConfigFile(addon, configFilePath string) (ac *addonConfig) {
 	type configFile struct {
 		Addons addonConfig `json:"addons"`
 	}
-	var config configFile
+	var cf configFile
 
 	if configFilePath != "" {
 		out.Ln("Reading %s configs from %s", addon, configFilePath)
@@ -150,14 +150,14 @@ func loadAddonConfigFile(addon, configFilePath string) (ac *addonConfig) {
 				fmt.Sprintf("error opening config file: %s", configFilePath))
 		}
 
-		if err = json.Unmarshal(confData, &config); err != nil {
+		if err = json.Unmarshal(confData, &cf); err != nil {
 			// err = errors2.Wrapf(err, "error reading config file (%s)", configFilePath)
 			klog.Errorf("error reading config file (%s): %v", configFilePath, err)
 			exit.Message(reason.Kind{ExitCode: reason.ExProgramConfig, Advice: "provide a valid config file"},
 				fmt.Sprintf("error reading config file: %v", err))
 		}
 
-		return &config.Addons
+		return &cf.Addons
 	}
 	return nil
 }

cmd/minikube/cmd/config/configure_registry_creds.go

@@ -92,7 +92,9 @@ func processRegistryCredsConfig(profile string, ac *addonConfig) {
 
 	regCredsConf := &ac.RegistryCreds
 	awsEcrAction := regCredsConf.EnableAWSEcr // regCredsConf. "enableAWSEcr")
-	if awsEcrAction == "prompt" || awsEcrAction == "" {
+
+	switch awsEcrAction {
+	case "prompt", "":
 		enableAWSECR := AskForYesNoConfirmation("\nDo you want to enable AWS Elastic Container Registry?", posResponses, negResponses)
 		if enableAWSECR {
 			awsAccessID = AskForStaticValue("-- Enter AWS Access Key ID: ")
@@ -102,7 +104,7 @@ func processRegistryCredsConfig(profile string, ac *addonConfig) {
 			awsAccount = AskForStaticValue("-- Enter 12 digit AWS Account ID (Comma separated list): ")
 			awsRole = AskForStaticValueOptional("-- (Optional) Enter ARN of AWS role to assume: ")
 		}
-	} else if awsEcrAction == "enable" {
+	case "enable":
 		out.Ln("Loading AWS ECR configs from: %s", addonConfigFile)
 		// Then read the configs
 		awsAccessID = regCredsConf.EcrConfigs.AccessID
@@ -111,15 +113,17 @@ func processRegistryCredsConfig(profile string, ac *addonConfig) {
 		awsRegion = regCredsConf.EcrConfigs.Region
 		awsAccount = regCredsConf.EcrConfigs.Account
 		awsRole = regCredsConf.EcrConfigs.Role
-	} else if awsEcrAction == "disable" {
+	case "disable":
 		out.Ln("Ignoring AWS ECR configs")
-	} else {
+	default:
 		out.Ln("Disabling AWS ECR.  Invalid value for enableAWSEcr (%s).  Must be one of 'disable', 'enable' or 'prompt'", awsEcrAction)
 	}
 
 	gcrPath := ""
 	gcrAction := regCredsConf.EnableGCR
-	if gcrAction == "prompt" || gcrAction == "" {
+
+	switch gcrAction {
+	case "prompt", "":
 		enableGCR := AskForYesNoConfirmation("\nDo you want to enable Google Container Registry?", posResponses, negResponses)
 		if enableGCR {
 			gcrPath = AskForStaticValue("-- Enter path to credentials (e.g. /home/user/.config/gcloud/application_default_credentials.json):")
@@ -129,14 +133,14 @@ func processRegistryCredsConfig(profile string, ac *addonConfig) {
 				gcrURL = AskForStaticValue("-- Enter GCR URL (e.g. https://asia.gcr.io):")
 			}
 		}
-	} else if gcrAction == "enable" {
+	case "enable":
 		out.Ln("Loading GCR configs from: %s", addonConfigFile)
 		// Then read the configs
 		gcrPath = regCredsConf.GcrConfigs.GcrPath
 		gcrURL = regCredsConf.GcrConfigs.GcrURL
-	} else if gcrAction == "disable" {
+	case "disable":
 		out.Ln("Ignoring GCR configs")
-	} else {
+	default:
 		out.Ln("Disabling GCR.  Invalid value for enableGCR (%s).  Must be one of 'disable', 'enable' or 'prompt'", gcrAction)
 	}
 
@@ -152,40 +156,44 @@ func processRegistryCredsConfig(profile string, ac *addonConfig) {
 	}
 
 	dockerRegistryAction := regCredsConf.EnableDockerRegistry
-	if dockerRegistryAction == "prompt" || dockerRegistryAction == "" {
+
+	switch dockerRegistryAction {
+	case "prompt", "":
 		enableDR := AskForYesNoConfirmation("\nDo you want to enable Docker Registry?", posResponses, negResponses)
 		if enableDR {
 			dockerServer = AskForStaticValue("-- Enter docker registry server url: ")
 			dockerUser = AskForStaticValue("-- Enter docker registry username: ")
 			dockerPass = AskForPasswordValue("-- Enter docker registry password: ")
 		}
-	} else if dockerRegistryAction == "enable" {
+	case "enable":
 		out.Ln("Loading Docker Registry configs from: %s", addonConfigFile)
 		dockerServer = regCredsConf.DockerConfigs.DockerServer
 		dockerUser = regCredsConf.DockerConfigs.DockerUser
 		dockerPass = regCredsConf.DockerConfigs.DockerPass
-	} else if dockerRegistryAction == "disable" {
+	case "disable":
 		out.Ln("Ignoring Docker Registry configs")
-	} else {
+	default:
 		out.Ln("Disabling Docker Registry.  Invalid value for enableDockerRegistry (%s).  Must be one of 'disable', 'enable' or 'prompt'", dockerRegistryAction)
 	}
 
 	acrAction := regCredsConf.EnableACR
-	if acrAction == "prompt" || acrAction == "" {
+
+	switch acrAction {
+	case "prompt", "":
 		enableACR := AskForYesNoConfirmation("\nDo you want to enable Azure Container Registry?", posResponses, negResponses)
 		if enableACR {
 			acrURL = AskForStaticValue("-- Enter Azure Container Registry (ACR) URL: ")
 			acrClientID = AskForStaticValue("-- Enter client ID (service principal ID) to access ACR: ")
 			acrPassword = AskForPasswordValue("-- Enter service principal password to access Azure Container Registry: ")
 		}
-	} else if acrAction == "enable" {
+	case "enable":
 		out.Ln("Loading ACR configs from: ", addonConfigFile)
 		acrURL = regCredsConf.AcrConfigs.AcrURL
 		acrClientID = regCredsConf.AcrConfigs.AcrClientID
 		acrPassword = regCredsConf.AcrConfigs.AcrPassword
-	} else if acrAction == "disable" {
+	case "disable":
 		out.Ln("Ignoring ACR configs")
-	} else {
+	default:
 		out.Stringf("Disabling ACR.  Invalid value for enableACR (%s).  Must be one of 'disable', 'enable' or 'prompt'", acrAction)
 	}
 

cmd/minikube/cmd/config/kubernetes_version.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/google/go-github/v72/github"
+	"github.com/google/go-github/v73/github"
 	"golang.org/x/mod/semver"
 	"k8s.io/minikube/pkg/minikube/constants"
 )

cmd/minikube/cmd/config/profile_list.go

@@ -40,8 +40,11 @@ import (
 	"k8s.io/klog/v2"
 )
 
-var profileOutput string
-var isLight bool
+var (
+	profileOutput string
+	isLight       bool
+	isDetailed    bool
+)
 
 var profileListCmd = &cobra.Command{
 	Use:   "list",
@@ -130,7 +133,13 @@ func profileStatus(p *config.Profile, api libmachine.API) cluster.State {
 
 func renderProfilesTable(ps [][]string) {
 	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"Profile", "VM Driver", "Runtime", "IP", "Port", "Version", "Status", "Nodes", "Active Profile", "Active Kubecontext"})
+	if isDetailed {
+		table.SetHeader([]string{"Profile", "Driver", "Runtime", "IP", "Port", "Version",
+			"Status", "Nodes", "Active Profile", "Active Kubecontext"})
+	} else {
+		table.SetHeader([]string{"Profile", "Driver", "Runtime", "IP", "Version", "Status",
+			"Nodes", "Active Profile", "Active Kubecontext"})
+	}
 	table.SetAutoFormatHeaders(false)
 	table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true})
 	table.SetCenterSeparator("|")
@@ -164,7 +173,13 @@ func profilesToTableData(profiles []*config.Profile) [][]string {
 		if p.ActiveKubeContext {
 			k = "*"
 		}
-		data = append(data, []string{p.Name, p.Config.Driver, p.Config.KubernetesConfig.ContainerRuntime, cpIP, strconv.Itoa(cpPort), k8sVersion, p.Status, strconv.Itoa(len(p.Config.Nodes)), c, k})
+		if isDetailed {
+			data = append(data, []string{p.Name, p.Config.Driver, p.Config.KubernetesConfig.ContainerRuntime,
+				cpIP, strconv.Itoa(cpPort), k8sVersion, p.Status, strconv.Itoa(len(p.Config.Nodes)), c, k})
+		} else {
+			data = append(data, []string{p.Name, p.Config.Driver, p.Config.KubernetesConfig.ContainerRuntime,
+				cpIP, k8sVersion, p.Status, strconv.Itoa(len(p.Config.Nodes)), c, k})
+		}
 	}
 	return data
 }
@@ -213,5 +228,6 @@ func profilesOrDefault(profiles []*config.Profile) []*config.Profile {
 func init() {
 	profileListCmd.Flags().StringVarP(&profileOutput, "output", "o", "table", "The output format. One of 'json', 'table'")
 	profileListCmd.Flags().BoolVarP(&isLight, "light", "l", false, "If true, returns list of profiles faster by skipping validating the status of the cluster.")
+	profileListCmd.Flags().BoolVarP(&isDetailed, "detailed", "d", false, "If true, returns a detailed list of profiles.")
 	ProfileCmd.AddCommand(profileListCmd)
 }