Merge pull request #1 from kubernetes/master

Merging from upstream
kubernetes · Sep 2, 2023 · 7f75e80 · 7f75e80
2 parents 5aeb4a5 + 856c4f2
commit 7f75e80
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 68 deletions.
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash
@@ -1 +1,2 @@
 sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1  nerdctl-1.4.0-linux-arm64.tar.gz
+sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7  nerdctl-1.5.0-linux-arm64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NERDCTL_BIN_AARCH64_VERSION = 1.4.0
-NERDCTL_BIN_AARCH64_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9
+NERDCTL_BIN_AARCH64_VERSION = 1.5.0
+NERDCTL_BIN_AARCH64_COMMIT = b33a58f288bc42351404a016e694190b897cd252
 NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION)
 NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
 NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash
@@ -1 +1,2 @@
 sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc  nerdctl-1.4.0-linux-amd64.tar.gz
+sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1  nerdctl-1.5.0-linux-amd64.tar.gz
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk
@@ -4,8 +4,8 @@
 # 
 ################################################################################
 
-NERDCTL_BIN_VERSION = 1.4.0
-NERDCTL_BIN_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9
+NERDCTL_BIN_VERSION = 1.5.0
+NERDCTL_BIN_COMMIT = b33a58f288bc42351404a016e694190b897cd252
 NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION)
 NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz
 NERDCTL_BIN_STRIP_COMPONENTS = 0

diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
@@ -49,7 +49,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.3"
 ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
 ARG CNI_PLUGINS_VERSION="v1.3.0"
 ARG TARGETARCH
-ARG NERDCTL_VERSION="1.0.0"
+ARG NERDCTL_VERSION="1.5.0"
 ARG NERDCTLD_VERSION="0.2.0"
 
 # copy in static files (configs, scripts)

diff --git a/go.mod b/go.mod
@@ -55,7 +55,7 @@ require (
 	github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
 	go.opencensus.io v0.24.0
 	go.opentelemetry.io/otel v1.17.0
-	go.opentelemetry.io/otel/sdk v1.16.0
+	go.opentelemetry.io/otel/sdk v1.17.0
 	go.opentelemetry.io/otel/trace v1.17.0
 	golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
 	golang.org/x/crypto v0.12.0

diff --git a/go.sum b/go.sum
@@ -2318,8 +2318,8 @@ go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa
 go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
 go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E=
-go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
-go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
+go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE=
+go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
 go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
 go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=

diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go
@@ -24,10 +24,10 @@ import (
 
 const (
 	// Version is the current version of kic
-	Version = "v0.0.40-1692872184-17120"
+	Version = "v0.0.40-1693218425-17145"
 
 	// SHA of the kic base image
-	baseImageSHA = "42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec"
+	baseImageSHA = "b79ac53e13f1f04e9fd9bdd5eb7d937a6931d86b3cdddf46e6e66227aea180ad"
 	// The name of the GCR kicbase repository
 	gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
 	// The name of the Dockerhub kicbase repository

diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md
@@ -26,7 +26,7 @@ minikube start [flags]
       --apiserver-names strings           A set of apiserver names which are used in the generated certificate for kubernetes.  This can be used if you want to make the apiserver available from outside the machine
       --apiserver-port int                The apiserver listening port (default 8443)
       --auto-update-drivers               If set, automatically updates drivers to the latest version. Defaults to true. (default true)
-      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.40-1692872184-17120@sha256:42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec")
+      --base-image string                 The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.40-1693218425-17145@sha256:b79ac53e13f1f04e9fd9bdd5eb7d937a6931d86b3cdddf46e6e66227aea180ad")
       --binary-mirror string              Location to fetch kubectl, kubelet, & kubeadm binaries from.
       --cache-images                      If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
       --cert-expiration duration          Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

diff --git a/site/content/en/docs/contrib/leaderboard/2023.html b/site/content/en/docs/contrib/leaderboard/2023.html
@@ -87,7 +87,7 @@
 </head>
 <body>
     <h1>kubernetes/minikube</h1>
-    <div class="subtitle">2023-01-01 &mdash; 2023-07-31</div>
+    <div class="subtitle">2023-01-01 &mdash; 2023-08-31</div>
 
 
         <h2>Reviewers</h2>
@@ -103,21 +103,21 @@ <h3>Most Influential</h3>
                 function drawreviewCounts() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }],
-                    ["medyagh", 62, "62"],
-                    ["spowelljr", 43, "43"],
+                    ["medyagh", 69, "69"],
+                    ["spowelljr", 46, "46"],
                     ["afbjorklund", 6, "6"],
-                    ["eiffel-fl", 3, "3"],
                     ["aiyijing", 3, "3"],
+                    ["eiffel-fl", 3, "3"],
                     ["sharifelgamal", 2, "2"],
-                    ["shu-mutou", 1, "1"],
-                    ["atoato88", 1, "1"],
-                    ["alban", 1, "1"],
-                    ["profnandaa", 1, "1"],
+                    ["neersighted", 1, "1"],
                     ["sethrylan", 1, "1"],
-                    ["travisn", 1, "1"],
                     ["AkihiroSuda", 1, "1"],
+                    ["alban", 1, "1"],
+                    ["shu-mutou", 1, "1"],
+                    ["ComradeProgrammer", 1, "1"],
+                    ["tstromberg", 1, "1"],
                     ["shaneutt", 1, "1"],
-                    ["neersighted", 1, "1"],
+                    ["atoato88", 1, "1"],
 
                     ]);
 
@@ -150,21 +150,21 @@ <h3>Most Helpful</h3>
                 function drawreviewWords() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }],
-                    ["spowelljr", 5153, "5153"],
-                    ["medyagh", 2373, "2373"],
+                    ["spowelljr", 5459, "5459"],
+                    ["medyagh", 2463, "2463"],
                     ["afbjorklund", 1062, "1062"],
                     ["neersighted", 295, "295"],
+                    ["ComradeProgrammer", 175, "175"],
                     ["eiffel-fl", 174, "174"],
                     ["aiyijing", 165, "165"],
                     ["shu-mutou", 137, "137"],
                     ["atoato88", 46, "46"],
                     ["shaneutt", 39, "39"],
-                    ["travisn", 24, "24"],
                     ["sharifelgamal", 24, "24"],
+                    ["travisn", 24, "24"],
                     ["alban", 19, "19"],
                     ["profnandaa", 17, "17"],
                     ["AkihiroSuda", 8, "8"],
-                    ["sethrylan", 7, "7"],
 
                     ]);
 
@@ -197,21 +197,21 @@ <h3>Most Demanding</h3>
                 function drawreviewComments() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }],
-                    ["spowelljr", 119, "119"],
-                    ["medyagh", 62, "62"],
+                    ["spowelljr", 128, "128"],
+                    ["medyagh", 66, "66"],
                     ["aiyijing", 7, "7"],
                     ["neersighted", 4, "4"],
                     ["afbjorklund", 2, "2"],
                     ["eiffel-fl", 2, "2"],
+                    ["tstromberg", 1, "1"],
                     ["sethrylan", 1, "1"],
-                    ["AkihiroSuda", 1, "1"],
                     ["alban", 1, "1"],
-                    ["tstromberg", 1, "1"],
-                    ["sharifelgamal", 0, "0"],
+                    ["AkihiroSuda", 1, "1"],
+                    ["ComradeProgrammer", 0, "0"],
                     ["shaneutt", 0, "0"],
-                    ["travisn", 0, "0"],
-                    ["atoato88", 0, "0"],
                     ["shu-mutou", 0, "0"],
+                    ["profnandaa", 0, "0"],
+                    ["sharifelgamal", 0, "0"],
 
                     ]);
 
@@ -248,21 +248,21 @@ <h3>Most Active</h3>
                 function drawprCounts() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }],
-                    ["spowelljr", 183, "183"],
-                    ["afbjorklund", 16, "16"],
+                    ["spowelljr", 201, "201"],
+                    ["afbjorklund", 19, "19"],
+                    ["jeffmaury", 9, "9"],
                     ["medyagh", 9, "9"],
-                    ["jeffmaury", 7, "7"],
-                    ["ComradeProgrammer", 7, "7"],
-                    ["aiyijing", 6, "6"],
+                    ["aiyijing", 8, "8"],
+                    ["ComradeProgrammer", 8, "8"],
+                    ["zdxgs", 6, "6"],
                     ["syxunion", 6, "6"],
-                    ["zdxgs", 5, "5"],
-                    ["prezha", 4, "4"],
+                    ["prezha", 5, "5"],
+                    ["joaquimrocha", 4, "4"],
                     ["yolossn", 4, "4"],
+                    ["JudahNour", 3, "3"],
                     ["shubhbapna", 3, "3"],
-                    ["joaquimrocha", 3, "3"],
                     ["lixin963", 3, "3"],
-                    ["jmloyola", 2, "2"],
-                    ["testwill", 2, "2"],
+                    ["oldium", 2, "2"],
 
                     ]);
 
@@ -295,16 +295,16 @@ <h3>Big Movers</h3>
                 function drawprDeltas() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }],
-                    ["spowelljr", 10256, "10256"],
-                    ["prezha", 3865, "3865"],
-                    ["ComradeProgrammer", 1005, "1005"],
+                    ["spowelljr", 12119, "12119"],
+                    ["prezha", 3881, "3881"],
+                    ["ComradeProgrammer", 1009, "1009"],
                     ["gAmUssA", 855, "855"],
+                    ["afbjorklund", 711, "711"],
                     ["denisok", 693, "693"],
-                    ["afbjorklund", 660, "660"],
+                    ["JudahNour", 538, "538"],
                     ["yolossn", 481, "481"],
                     ["x7upLime", 398, "398"],
                     ["shubhbapna", 301, "301"],
-                    ["JudahNour", 227, "227"],
                     ["OmSaran", 216, "216"],
                     ["fvoznika", 202, "202"],
                     ["AkihiroSuda", 192, "192"],
@@ -343,20 +343,20 @@ <h3>Most difficult to review</h3>
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }],
                     ["gAmUssA", 677, "677"],
-                    ["prezha", 603, "603"],
+                    ["prezha", 485, "485"],
                     ["x7upLime", 366, "366"],
                     ["denisok", 324, "324"],
-                    ["JudahNour", 209, "209"],
                     ["AkihiroSuda", 190, "190"],
-                    ["ComradeProgrammer", 130, "130"],
+                    ["JudahNour", 173, "173"],
                     ["yolossn", 119, "119"],
+                    ["ComradeProgrammer", 114, "114"],
                     ["OmSaran", 99, "99"],
                     ["salasberryfin", 92, "92"],
                     ["norshtein", 77, "77"],
                     ["msharran", 77, "77"],
                     ["shubhbapna", 70, "70"],
                     ["elizabeth-dev", 41, "41"],
-                    ["spowelljr", 39, "39"],
+                    ["spowelljr", 41, "41"],
 
                     ]);
 
@@ -393,21 +393,21 @@ <h3>Most Active</h3>
                 function drawcomments() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }],
-                    ["afbjorklund", 168, "168"],
+                    ["afbjorklund", 182, "182"],
                     ["spowelljr", 75, "75"],
                     ["kundan2707", 36, "36"],
-                    ["medyagh", 17, "17"],
+                    ["medyagh", 19, "19"],
                     ["BenTheElder", 12, "12"],
+                    ["mprimeaux", 10, "10"],
                     ["ComradeProgrammer", 10, "10"],
-                    ["mprimeaux", 9, "9"],
                     ["prezha", 9, "9"],
                     ["nirs", 8, "8"],
                     ["torenware", 8, "8"],
                     ["lbogdan", 8, "8"],
-                    ["kant777", 6, "6"],
-                    ["mqasimsarfraz", 6, "6"],
-                    ["termdew", 6, "6"],
+                    ["uos-ljtian", 8, "8"],
                     ["sftim", 6, "6"],
+                    ["termdew", 6, "6"],
+                    ["kant777", 6, "6"],
 
                     ]);
 
@@ -440,21 +440,21 @@ <h3>Most Helpful</h3>
                 function drawcommentWords() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }],
-                    ["afbjorklund", 7512, "7512"],
+                    ["afbjorklund", 7931, "7931"],
                     ["spowelljr", 3935, "3935"],
                     ["prasanna-desikank", 2363, "2363"],
                     ["pluveto", 1042, "1042"],
                     ["BenTheElder", 1024, "1024"],
-                    ["mprimeaux", 985, "985"],
+                    ["mprimeaux", 1014, "1014"],
                     ["prezha", 963, "963"],
                     ["ShardulPrabhu", 783, "783"],
                     ["x7upLime", 775, "775"],
                     ["torenware", 747, "747"],
                     ["nirs", 638, "638"],
                     ["lbogdan", 471, "471"],
                     ["jackjie2016", 469, "469"],
+                    ["medyagh", 462, "462"],
                     ["blacksd", 448, "448"],
-                    ["FlyFlame", 443, "443"],
 
                     ]);
 
@@ -487,8 +487,8 @@ <h3>Top Closers</h3>
                 function drawissueCloser() {
                     var data = new google.visualization.arrayToDataTable([
                     [{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }],
-                    ["spowelljr", 59, "59"],
-                    ["medyagh", 31, "31"],
+                    ["spowelljr", 63, "63"],
+                    ["medyagh", 33, "33"],
                     ["afbjorklund", 5, "5"],
 
                     ]);