Merge branch 'kubernetes:master' into master

cambridgesemantics · Feb 9, 2023 · 8b95ea9 · 8b95ea9
2 parents b37c028 + 503215b
commit 8b95ea9
Show file tree

Hide file tree

Showing 55 changed files with 752 additions and 142 deletions.
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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml
@@ -22,7 +22,7 @@ on:
       - deleted
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 
 permissions:
   contents: read

diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml
@@ -6,7 +6,7 @@ on:
       - 'v*-beta.*'
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 2,14 * * *"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 9 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 9 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

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.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 6 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml
@@ -6,7 +6,7 @@ on:
     - cron: "0 0 2 * *"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20'
 permissions:
   contents: read
 

diff --git a/Makefile b/Makefile
@@ -34,9 +34,9 @@ RPM_REVISION ?= 0
 
 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below
 # update this only by running `make update-golang-version`
-GO_VERSION ?= 1.19.5
+GO_VERSION ?= 1.20
 # update this only by running `make update-golang-version`
-GO_K8S_VERSION_PREFIX ?= v1.26.0
+GO_K8S_VERSION_PREFIX ?= v1.27.0
 
 # replace "x.y.0" => "x.y". kube-cross and go.dev/dl use different formats for x.y.0 go versions
 KVM_GO_VERSION ?= $(GO_VERSION:.0=)
@@ -45,7 +45,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
 BUILDROOT_BRANCH ?= 2021.02.12
 # the go version on the line below is for the ISO and does not need to be updated often
-GOLANG_OPTIONS = GO_VERSION=1.19.5 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
+GOLANG_OPTIONS = GO_VERSION=1.20 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
 BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS)
 REGISTRY ?= gcr.io/k8s-minikube
 
@@ -78,7 +78,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 KERNEL_VERSION ?= 5.10.57
 # latest from https://github.com/golangci/golangci-lint/releases
 # update this only by running `make update-golint-version`
-GOLINT_VERSION ?= v1.50.1
+GOLINT_VERSION ?= v1.51.1
 # 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
@@ -720,6 +720,7 @@ update-cri-dockerd:
 
 .PHONY: local-kicbase
 local-kicbase: ## Builds the kicbase image and tags it local/kicbase:latest and local/kicbase:$(KIC_VERSION)-$(COMMIT_SHORT)
+	touch deploy/kicbase/CHANGELOG
 	docker build -f ./deploy/kicbase/Dockerfile -t local/kicbase:$(KIC_VERSION) --build-arg VERSION_JSON=$(VERSION_JSON) --build-arg COMMIT_SHA=${VERSION}-$(COMMIT_NOQUOTES) --cache-from $(KICBASE_IMAGE_GCR) .
 	docker tag local/kicbase:$(KIC_VERSION) local/kicbase:latest
 	docker tag local/kicbase:$(KIC_VERSION) local/kicbase:$(KIC_VERSION)-$(COMMIT_SHORT)

diff --git a/OWNERS b/OWNERS
@@ -8,7 +8,6 @@ reviewers:
   - spowelljr
 approvers:
   - afbjorklund
-  - sharifelgamal
   - medyagh
   - spowelljr
   - prezha
@@ -21,3 +20,4 @@ emeritus_approvers:
   - priyawadhwa
   - josedonizetti
   - tstromberg
+  - sharifelgamal
diff --git a/SECURITY_CONTACTS b/SECURITY_CONTACTS
@@ -10,7 +10,6 @@
 # DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
 # INSTRUCTIONS AT https://kubernetes.io/security/
 
-tstromberg
 afbjorklund
 medyagh
-sharifelgamal
+spowelljr
diff --git a/cmd/minikube/cmd/logs.go b/cmd/minikube/cmd/logs.go
@@ -52,6 +52,8 @@ var (
 	fileOutput string
 	// auditLogs only shows the audit logs
 	auditLogs bool
+	// lastStartOnly shows logs from last start
+	lastStartOnly bool
 )
 
 // logsCmd represents the logs command
@@ -75,6 +77,13 @@ var logsCmd = &cobra.Command{
 				exit.Error(reason.Usage, "Failed to create file", err)
 			}
 		}
+		if lastStartOnly {
+			err := logs.OutputLastStart()
+			if err != nil {
+				klog.Errorf("failed to output last start logs: %v", err)
+			}
+			return
+		}
 		if auditLogs {
 			err := logs.OutputAudit(numberOfLines)
 			if err != nil {
@@ -150,4 +159,5 @@ func init() {
 	logsCmd.Flags().StringVar(&nodeName, "node", "", "The node to get logs from. Defaults to the primary control plane.")
 	logsCmd.Flags().StringVar(&fileOutput, "file", "", "If present, writes to the provided file instead of stdout.")
 	logsCmd.Flags().BoolVar(&auditLogs, "audit", false, "Show only the audit logs")
+	logsCmd.Flags().BoolVar(&lastStartOnly, "last-start-only", false, "Show only the last start logs.")
 }
diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile
@@ -1,2 +1,2 @@
-FROM golang:1.19.5
+FROM golang:1.20
 ADD auto-pause-hook /auto-pause-hook
diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash
@@ -6,3 +6,4 @@ sha256  27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179  go1.19
 sha256  2ce930d70a931de660fdaf271d70192793b1b240272645bf0275779f6704df6b  go1.19.2.src.tar.gz
 sha256  18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212  go1.19.3.src.tar.gz
 sha256  8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f  go1.19.5.src.tar.gz
+sha256  3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33  go1.20.src.tar.gz
diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
@@ -19,7 +19,7 @@
 
 
 # multi-stage docker build so we can build auto-pause for arm64
-FROM golang:1.19.5 as auto-pause
+FROM golang:1.20 as auto-pause
 WORKDIR /src
 # auto-pause depends on core minikube code so we need to pass the whole source code as the context
 # copy in the minimal amount of source code possible
@@ -227,10 +227,7 @@ RUN systemctl enable docker.service
 # making SSH work for docker container
 # based on https://github.com/rastasheep/ubuntu-sshd/blob/master/18.04/Dockerfile
 RUN mkdir /var/run/sshd
-RUN echo 'root:root' |chpasswd
-RUN sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
 RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
-
 # minikube relies on /etc/hosts for control-plane discovery. This prevents nefarious DNS servers from breaking it.
 RUN sed -ri 's/dns files/files dns/g' /etc/nsswitch.conf