Merge branch 'master' of https://github.com/kubernetes/minikube into …

…master_srikrishnabh
presztak · Aug 26, 2021 · 6a9d08e · 6a9d08e
2 parents e744f3e + 0bb1f67
commit 6a9d08e
Show file tree

Hide file tree

Showing 206 changed files with 15,353 additions and 14,022 deletions.
diff --git a/.github/ISSUE_TEMPLATE/fr.md b/.github/ISSUE_TEMPLATE/fr.md
@@ -0,0 +1,24 @@
+---
+name: Français
+about: Signaler un problème
+labels: l/fr
+---
+<!--- Veuillez inclure la commande "minikube start" que vous avez utilisée dans vos étapes de reproduction --->
+**Étapes pour reproduire le problème:** 
+
+1.
+2. 
+3.
+
+**Sortie complète de la commande `minikube logs`:**
+<details>
+
+
+</details>
+
+<!--- TIP: Ajoutez l'indicateur "--alsologtostderr" à la ligne de commande pour plus de journaux --->
+**Sortie complète de la commande échouée:**
+<details>
+
+
+</details>
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ on:
       - "!deploy/iso/**"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   build_minikube:
     runs-on: ubuntu-18.04

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,7 +6,7 @@ on:
       - master  
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   generate-docs:
     runs-on: ubuntu-18.04
@@ -20,7 +20,10 @@ jobs:
         id: gendocs
         run: |
           make generate-docs
-          echo "::set-output name=changes::$(git status --porcelain)"
+          c=$(git status --porcelain)
+          c="${c//$'\n'/'%0A'}"
+          c="${c//$'\r'/'%0D'}"
+          echo "::set-output name=changes::$c"
       - name: Create PR
         if: ${{ steps.gendocs.outputs.changes != '' }}
         uses: peter-evans/create-pull-request@v3
@@ -37,6 +40,7 @@ jobs:
           body: |
             Committing changes resulting from `make generate-docs`.
             This PR is auto-generated by the [gendocs](https://github.com/kubernetes/minikube/blob/master/.github/workflows/docs.yml) CI workflow.
+
             ```
             ${{ steps.gendocs.outputs.changes }}
             ```
diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml
@@ -7,7 +7,7 @@ on:
   release:
     types: [published]
 env:
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   update-leaderboard:
     runs-on: ubuntu-latest
@@ -21,7 +21,10 @@ jobs:
         id: leaderboard
         run: |
           make update-leaderboard
-          echo "::set-output name=changes::$(git status --porcelain)"
+          c=$(git status --porcelain)
+          c="${c//$'\n'/'%0A'}"
+          c="${c//$'\r'/'%0D'}"
+          echo "::set-output name=changes::$c"
         env:
           GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }}
       - name: Create PR
@@ -40,6 +43,7 @@ jobs:
           body: |
             Committing changes resulting from `make update-leaderboard`.
             This PR is auto-generated by the [update-leaderboard](https://github.com/kubernetes/minikube/blob/master/.github/workflows/leaderboard.yml) CI workflow.
+
             ```
             ${{ steps.leaderboard.outputs.changes }}
             ```
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -14,7 +14,7 @@ on:
       - "!deploy/iso/**"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   # Runs before all other jobs
   # builds the minikube binaries

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -12,7 +12,7 @@ on:
       - "!deploy/iso/**"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   # Runs before all other jobs
   # builds the minikube binaries

diff --git a/.github/workflows/pr_verified.yaml b/.github/workflows/pr_verified.yaml
@@ -21,7 +21,7 @@ on:
       - deleted
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 
 jobs:
   # Runs before all other jobs
@@ -854,7 +854,7 @@ jobs:
           $docker_running = $?
           }
           Write-Output "Docker is running"
-          docker system prune -f 
+          docker system prune -f --volumes
       - name: Info
         shell: powershell
         run: |
@@ -949,7 +949,7 @@ jobs:
           $docker_running = $?
           }
           Write-Output "Docker is running"
-          docker system prune -f
+          docker system prune -f --volumes
       - name: Info
         continue-on-error: true
         shell: powershell

diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 2,14 * * *"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   time-to-k8s-public-chart:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml
@@ -5,7 +5,7 @@ on:
     types: [released]
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   benchmark:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
@@ -6,7 +6,7 @@ on:
       - "translations/**"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   unit_test:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml
@@ -6,9 +6,9 @@ on:
     - cron: "0 9 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
-  bump-k8s-versions:
+  bump-golang-version:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml
@@ -0,0 +1,45 @@
+name: "update-golint-version"
+on:
+  workflow_dispatch:
+  schedule:
+    # every Monday at around 3 am pacific/10 am UTC
+    - cron: "0 10 * * 1"
+env:
+  GOPROXY: https://proxy.golang.org
+  GO_VERSION: '1.16.7'
+jobs:
+  bump-golint-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{env.GO_VERSION}}
+          stable: true
+      - name: Bump Golint Versions
+        id: bumpGolint
+        run: |
+          make update-golint-version
+          echo "::set-output name=changes::$(git status --porcelain)"
+      - name: Create PR
+        if: ${{ steps.bumpGolint.outputs.changes != '' }}
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.MINIKUBE_BOT_PAT }}
+          commit-message: bump golaint versions
+          committer: minikube-bot <minikube-bot@google.com>
+          author: minikube-bot <minikube-bot@google.com>
+          branch: auto_bump_golint_version
+          push-to-fork: minikube-bot/minikube
+          base: master
+          delete-branch: true
+          title: 'bump golint version'
+          labels: ok-to-test
+          body: |
+            Golangci-lint Project release a [new version](https://github.com/golangci/golangci-lint/releases),
+
+            This PR was auto-generated by `make update-golint-version` using [update-golint-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-golint-version.yml) CI Workflow. 
+
+                   
+            
+            
diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 8 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.16.6'
+  GO_VERSION: '1.16.7'
 jobs:
   bump-k8s-versions:
     runs-on: ubuntu-20.04
@@ -20,7 +20,10 @@ jobs:
         id: bumpk8s
         run: |
           make update-kubernetes-version
-          echo "::set-output name=changes::$(git status --porcelain)"
+          c=$(git status --porcelain)
+          c="${c//$'\n'/'%0A'}"
+          c="${c//$'\r'/'%0D'}"
+          echo "::set-output name=changes::$c"
       - name: Create PR
         if: ${{ steps.bumpk8s.outputs.changes != '' }}
         uses: peter-evans/create-pull-request@v3
@@ -39,5 +42,7 @@ jobs:
             This PR was auto-generated by `make update-kubernetes-version` using [update-k8s-versions.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows) CI Workflow. 
             Please only merge if all the tests pass.
             
+            ```
             ${{ steps.bumpk8s.outputs.changes }}
+            ```
 
diff --git a/Makefile b/Makefile
@@ -23,7 +23,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.22.0-1627488369-11483
+ISO_VERSION ?= v1.22.0-1628974786-12268
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 DEB_REVISION ?= 0
@@ -32,14 +32,15 @@ RPM_VERSION ?= $(DEB_VERSION)
 RPM_REVISION ?= 0
 
 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below
-GO_VERSION ?= 1.16.6
+# update this only by running `make update-golang-version`
+GO_VERSION ?= 1.16.7
 
 # replace "x.y.0" => "x.y". kube-cross and golang.org/dl use different formats for x.y.0 go versions
 KVM_GO_VERSION ?= $(GO_VERSION:.0=)
 
 
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
-BUILDROOT_BRANCH ?= 2020.02.12
+BUILDROOT_BRANCH ?= 2021.02.4
 REGISTRY ?= gcr.io/k8s-minikube
 
 # Get git commit id
@@ -65,17 +66,18 @@ MINIKUBE_BUCKET ?= minikube/releases
 MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
 MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 
-KERNEL_VERSION ?= 4.19.182
-# latest from https://github.com/golangci/golangci-lint/releases
-GOLINT_VERSION ?= v1.39.0
+KERNEL_VERSION ?= 4.19.202
+# latest from https://github.com/golangci/golangci-lint/releases 
+# update this only by running `make update-golint-version`
+GOLINT_VERSION ?= v1.42.0
 # Limit number of default jobs, to avoid the CI builds running out of memory
 GOLINT_JOBS ?= 4
 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
 GOLINT_GOGC ?= 100
 # options for lint (golangci-lint)
 GOLINT_OPTIONS = --timeout 7m \
 	  --build-tags "${MINIKUBE_INTEGRATION_BUILD_TAGS}" \
-	  --enable gofmt,goimports,gocritic,golint,gocyclo,misspell,nakedret,stylecheck,unconvert,unparam,dogsled \
+	  --enable gofmt,goimports,gocritic,revive,gocyclo,misspell,nakedret,stylecheck,unconvert,unparam,dogsled \
 	  --exclude 'variable on range scope.*in function literal|ifElseChain'
 
 export GO111MODULE := on
@@ -280,8 +282,6 @@ minikube_iso: deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/b
 		git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
 	fi;
 	$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot
-	mkdir -p $(BUILD_DIR)/buildroot/output/build
-	echo "module buildroot.org/go" > $(BUILD_DIR)/buildroot/output/build/go.mod
 	$(MAKE) -C $(BUILD_DIR)/buildroot host-python
 	$(MAKE) -C $(BUILD_DIR)/buildroot
 	mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso
@@ -682,7 +682,7 @@ docker-multi-arch-builder:
 	env $(X_BUILD_ENV) docker buildx rm --builder $(X_DOCKER_BUILDER) || true
 	env $(X_BUILD_ENV) docker buildx create --name $(X_DOCKER_BUILDER) --buildkitd-flags '--debug' || true
 
-KICBASE_ARCH = linux/arm64,linux/amd64
+KICBASE_ARCH = linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x
 KICBASE_IMAGE_GCR ?= $(REGISTRY)/kicbase:$(KIC_VERSION)
 KICBASE_IMAGE_HUB ?= kicbase/stable:$(KIC_VERSION)
 KICBASE_IMAGE_REGISTRIES ?= $(KICBASE_IMAGE_GCR) $(KICBASE_IMAGE_HUB)
@@ -702,6 +702,10 @@ endif
 local-kicbase-debug: local-kicbase ## Builds a local kicbase image and switches source code to point to it
 	$(SED) 's|Version = .*|Version = \"$(KIC_VERSION)-$(COMMIT_SHORT)\"|;s|baseImageSHA = .*|baseImageSHA = \"\"|;s|gcrRepo = .*|gcrRepo = \"local/kicbase\"|;s|dockerhubRepo = .*|dockerhubRepo = \"local/kicbase\"|' pkg/drivers/kic/types.go
 
+.PHONY: build-kic-base-image
+build-kic-base-image: docker-multi-arch-builder ## Build multi-arch local/kicbase:latest
+	env $(X_BUILD_ENV) docker buildx build -f ./deploy/kicbase/Dockerfile --builder $(X_DOCKER_BUILDER) --platform $(KICBASE_ARCH) $(addprefix -t ,$(KICBASE_IMAGE_REGISTRIES)) --load  --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) .
+
 .PHONY: push-kic-base-image 
 push-kic-base-image: docker-multi-arch-builder ## Push multi-arch local/kicbase:latest to all remote registries
 ifdef AUTOPUSH
@@ -781,7 +785,7 @@ release-notes:
 update-leaderboard:
 	hack/update_contributions.sh
 
-out/docker-machine-driver-kvm2: out/docker-machine-driver-kvm2-amd64
+out/docker-machine-driver-kvm2: out/docker-machine-driver-kvm2-$(GOARCH)
 	$(if $(quiet),@echo "  CP       $@")
 	$(Q)cp $< $@
 
@@ -969,6 +973,12 @@ update-kubernetes-version:
 	(cd hack/update/kubernetes_version && \
 	 go run update_kubernetes_version.go)
 
+.PHONY: update-golint-version
+update-golint-version:
+	(cd hack/update/golint_version && \
+	 go run update_golint_version.go)
+
+
 .PHONY: update-kubernetes-version-pr
 update-kubernetes-version-pr:
 ifndef GITHUB_TOKEN

diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ minikube runs the latest stable release of Kubernetes, with support for standard
 * [Dashboard](https://minikube.sigs.k8s.io/docs/handbook/dashboard/) - `minikube dashboard`
 * [Container runtimes](https://minikube.sigs.k8s.io/docs/handbook/config/#runtime-configuration) - `minikube start --container-runtime`
 * [Configure apiserver and kubelet options](https://minikube.sigs.k8s.io/docs/handbook/config/#modifying-kubernetes-defaults) via command-line flags
+* Supports common [CI environments](https://github.com/minikube-ci/examples)
 
 As well as developer-friendly features:
 

diff --git a/cmd/auto-pause/auto-pause-hook/config.go b/cmd/auto-pause/auto-pause-hook/config.go
@@ -91,8 +91,8 @@ func selfRegistration(clientset *kubernetes.Clientset, caCert []byte) {
 			klog.Fatal(err2)
 		}
 	}
-	var failurePolicy v1.FailurePolicyType = v1.Fail
-	var sideEffects v1.SideEffectClass = v1.SideEffectClassNone
+	var failurePolicy = v1.Fail
+	var sideEffects = v1.SideEffectClassNone
 
 	webhookConfig := &v1.MutatingWebhookConfiguration{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
@@ -157,7 +157,8 @@ func runDelete(cmd *cobra.Command, args []string) {
 	if err != nil {
 		klog.Warningf("'error loading profiles in minikube home %q: %v", localpath.MiniPath(), err)
 	}
-	profilesToDelete := append(validProfiles, invalidProfiles...)
+	profilesToDelete := validProfiles
+	profilesToDelete = append(profilesToDelete, invalidProfiles...)
 	// in the case user has more than 1 profile and runs --purge
 	// to prevent abandoned VMs/containers, force user to run with delete --all
 	if purge && len(profilesToDelete) > 1 && !deleteAll {

diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go
@@ -221,7 +221,8 @@ func TestDeleteAllProfiles(t *testing.T) {
 		t.Errorf("ListProfiles length = %d, expected %d\nvalid: %v\ninvalid: %v\n", len(validProfiles)+len(inValidProfiles), numberOfTotalProfileDirs, validProfiles, inValidProfiles)
 	}
 
-	profiles := append(validProfiles, inValidProfiles...)
+	profiles := validProfiles
+	profiles = append(profiles, inValidProfiles...)
 	hostAndDirsDeleter = hostAndDirsDeleterMock
 	errs := DeleteProfiles(profiles)