Skip to content

Commit 7f75e80

Browse files
rmsilva1973rmsilva1973
authored
Merge pull request #1 from kubernetes/master
Merging from upstream
2 parents 5aeb4a5 + 856c4f2 commit 7f75e80

File tree

11 files changed

+70
-68
lines changed

11 files changed

+70
-68
lines changed

‎deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1 nerdctl-1.4.0-linux-arm64.tar.gz
2+
sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7 nerdctl-1.5.0-linux-arm64.tar.gz

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
NERDCTL_BIN_AARCH64_VERSION = 1.4.0
8-
NERDCTL_BIN_AARCH64_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9
7+
NERDCTL_BIN_AARCH64_VERSION = 1.5.0
8+
NERDCTL_BIN_AARCH64_COMMIT = b33a58f288bc42351404a016e694190b897cd252
99
NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION)
1010
NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
1111
NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0

‎deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc nerdctl-1.4.0-linux-amd64.tar.gz
2+
sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1 nerdctl-1.5.0-linux-amd64.tar.gz

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
NERDCTL_BIN_VERSION = 1.4.0
8-
NERDCTL_BIN_COMMIT = 7e8114a82da342cdbec9a518c5c6a1cce58105e9
7+
NERDCTL_BIN_VERSION = 1.5.0
8+
NERDCTL_BIN_COMMIT = b33a58f288bc42351404a016e694190b897cd252
99
NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION)
1010
NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz
1111
NERDCTL_BIN_STRIP_COMPONENTS = 0

‎deploy/kicbase/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.3"
4949
ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
5050
ARG CNI_PLUGINS_VERSION="v1.3.0"
5151
ARG TARGETARCH
52-
ARG NERDCTL_VERSION="1.0.0"
52+
ARG NERDCTL_VERSION="1.5.0"
5353
ARG NERDCTLD_VERSION="0.2.0"
5454

5555
# copy in static files (configs, scripts)

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
5656
go.opencensus.io v0.24.0
5757
go.opentelemetry.io/otel v1.17.0
58-
go.opentelemetry.io/otel/sdk v1.16.0
58+
go.opentelemetry.io/otel/sdk v1.17.0
5959
go.opentelemetry.io/otel/trace v1.17.0
6060
golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
6161
golang.org/x/crypto v0.12.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2318,8 +2318,8 @@ go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa
23182318
go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
23192319
go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
23202320
go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E=
2321-
go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE=
2322-
go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4=
2321+
go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE=
2322+
go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
23232323
go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
23242324
go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
23252325
go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=

‎pkg/drivers/kic/types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.40-1692872184-17120"
27+
Version = "v0.0.40-1693218425-17145"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec"
30+
baseImageSHA = "b79ac53e13f1f04e9fd9bdd5eb7d937a6931d86b3cdddf46e6e66227aea180ad"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

‎site/content/en/docs/commands/start.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ minikube start [flags]
2626
--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
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
29-
--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")
29+
--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")
3030
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3131
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3232
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

‎site/content/en/docs/contrib/leaderboard/2023.html‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</head>
8888
<body>
8989
<h1>kubernetes/minikube</h1>
90-
<div class="subtitle">2023-01-01 &mdash; 2023-07-31</div>
90+
<div class="subtitle">2023-01-01 &mdash; 2023-08-31</div>
9191

9292

9393
<h2>Reviewers</h2>
@@ -103,21 +103,21 @@ <h3>Most Influential</h3>
103103
function drawreviewCounts() {
104104
var data = new google.visualization.arrayToDataTable([
105105
[{label:'',type:'string'},{label: '# of Merged PRs reviewed', type: 'number'}, { role: 'annotation' }],
106-
["medyagh", 62, "62"],
107-
["spowelljr", 43, "43"],
106+
["medyagh", 69, "69"],
107+
["spowelljr", 46, "46"],
108108
["afbjorklund", 6, "6"],
109-
["eiffel-fl", 3, "3"],
110109
["aiyijing", 3, "3"],
110+
["eiffel-fl", 3, "3"],
111111
["sharifelgamal", 2, "2"],
112-
["shu-mutou", 1, "1"],
113-
["atoato88", 1, "1"],
114-
["alban", 1, "1"],
115-
["profnandaa", 1, "1"],
112+
["neersighted", 1, "1"],
116113
["sethrylan", 1, "1"],
117-
["travisn", 1, "1"],
118114
["AkihiroSuda", 1, "1"],
115+
["alban", 1, "1"],
116+
["shu-mutou", 1, "1"],
117+
["ComradeProgrammer", 1, "1"],
118+
["tstromberg", 1, "1"],
119119
["shaneutt", 1, "1"],
120-
["neersighted", 1, "1"],
120+
["atoato88", 1, "1"],
121121

122122
]);
123123

@@ -150,21 +150,21 @@ <h3>Most Helpful</h3>
150150
function drawreviewWords() {
151151
var data = new google.visualization.arrayToDataTable([
152152
[{label:'',type:'string'},{label: '# of words written in merged PRs', type: 'number'}, { role: 'annotation' }],
153-
["spowelljr", 5153, "5153"],
154-
["medyagh", 2373, "2373"],
153+
["spowelljr", 5459, "5459"],
154+
["medyagh", 2463, "2463"],
155155
["afbjorklund", 1062, "1062"],
156156
["neersighted", 295, "295"],
157+
["ComradeProgrammer", 175, "175"],
157158
["eiffel-fl", 174, "174"],
158159
["aiyijing", 165, "165"],
159160
["shu-mutou", 137, "137"],
160161
["atoato88", 46, "46"],
161162
["shaneutt", 39, "39"],
162-
["travisn", 24, "24"],
163163
["sharifelgamal", 24, "24"],
164+
["travisn", 24, "24"],
164165
["alban", 19, "19"],
165166
["profnandaa", 17, "17"],
166167
["AkihiroSuda", 8, "8"],
167-
["sethrylan", 7, "7"],
168168

169169
]);
170170

@@ -197,21 +197,21 @@ <h3>Most Demanding</h3>
197197
function drawreviewComments() {
198198
var data = new google.visualization.arrayToDataTable([
199199
[{label:'',type:'string'},{label: '# of Review Comments in merged PRs', type: 'number'}, { role: 'annotation' }],
200-
["spowelljr", 119, "119"],
201-
["medyagh", 62, "62"],
200+
["spowelljr", 128, "128"],
201+
["medyagh", 66, "66"],
202202
["aiyijing", 7, "7"],
203203
["neersighted", 4, "4"],
204204
["afbjorklund", 2, "2"],
205205
["eiffel-fl", 2, "2"],
206+
["tstromberg", 1, "1"],
206207
["sethrylan", 1, "1"],
207-
["AkihiroSuda", 1, "1"],
208208
["alban", 1, "1"],
209-
["tstromberg", 1, "1"],
210-
["sharifelgamal", 0, "0"],
209+
["AkihiroSuda", 1, "1"],
210+
["ComradeProgrammer", 0, "0"],
211211
["shaneutt", 0, "0"],
212-
["travisn", 0, "0"],
213-
["atoato88", 0, "0"],
214212
["shu-mutou", 0, "0"],
213+
["profnandaa", 0, "0"],
214+
["sharifelgamal", 0, "0"],
215215

216216
]);
217217

@@ -248,21 +248,21 @@ <h3>Most Active</h3>
248248
function drawprCounts() {
249249
var data = new google.visualization.arrayToDataTable([
250250
[{label:'',type:'string'},{label: '# of Pull Requests Merged', type: 'number'}, { role: 'annotation' }],
251-
["spowelljr", 183, "183"],
252-
["afbjorklund", 16, "16"],
251+
["spowelljr", 201, "201"],
252+
["afbjorklund", 19, "19"],
253+
["jeffmaury", 9, "9"],
253254
["medyagh", 9, "9"],
254-
["jeffmaury", 7, "7"],
255-
["ComradeProgrammer", 7, "7"],
256-
["aiyijing", 6, "6"],
255+
["aiyijing", 8, "8"],
256+
["ComradeProgrammer", 8, "8"],
257+
["zdxgs", 6, "6"],
257258
["syxunion", 6, "6"],
258-
["zdxgs", 5, "5"],
259-
["prezha", 4, "4"],
259+
["prezha", 5, "5"],
260+
["joaquimrocha", 4, "4"],
260261
["yolossn", 4, "4"],
262+
["JudahNour", 3, "3"],
261263
["shubhbapna", 3, "3"],
262-
["joaquimrocha", 3, "3"],
263264
["lixin963", 3, "3"],
264-
["jmloyola", 2, "2"],
265-
["testwill", 2, "2"],
265+
["oldium", 2, "2"],
266266

267267
]);
268268

@@ -295,16 +295,16 @@ <h3>Big Movers</h3>
295295
function drawprDeltas() {
296296
var data = new google.visualization.arrayToDataTable([
297297
[{label:'',type:'string'},{label: 'Lines of code (delta)', type: 'number'}, { role: 'annotation' }],
298-
["spowelljr", 10256, "10256"],
299-
["prezha", 3865, "3865"],
300-
["ComradeProgrammer", 1005, "1005"],
298+
["spowelljr", 12119, "12119"],
299+
["prezha", 3881, "3881"],
300+
["ComradeProgrammer", 1009, "1009"],
301301
["gAmUssA", 855, "855"],
302+
["afbjorklund", 711, "711"],
302303
["denisok", 693, "693"],
303-
["afbjorklund", 660, "660"],
304+
["JudahNour", 538, "538"],
304305
["yolossn", 481, "481"],
305306
["x7upLime", 398, "398"],
306307
["shubhbapna", 301, "301"],
307-
["JudahNour", 227, "227"],
308308
["OmSaran", 216, "216"],
309309
["fvoznika", 202, "202"],
310310
["AkihiroSuda", 192, "192"],
@@ -343,20 +343,20 @@ <h3>Most difficult to review</h3>
343343
var data = new google.visualization.arrayToDataTable([
344344
[{label:'',type:'string'},{label: 'Average PR size (added+changed)', type: 'number'}, { role: 'annotation' }],
345345
["gAmUssA", 677, "677"],
346-
["prezha", 603, "603"],
346+
["prezha", 485, "485"],
347347
["x7upLime", 366, "366"],
348348
["denisok", 324, "324"],
349-
["JudahNour", 209, "209"],
350349
["AkihiroSuda", 190, "190"],
351-
["ComradeProgrammer", 130, "130"],
350+
["JudahNour", 173, "173"],
352351
["yolossn", 119, "119"],
352+
["ComradeProgrammer", 114, "114"],
353353
["OmSaran", 99, "99"],
354354
["salasberryfin", 92, "92"],
355355
["norshtein", 77, "77"],
356356
["msharran", 77, "77"],
357357
["shubhbapna", 70, "70"],
358358
["elizabeth-dev", 41, "41"],
359-
["spowelljr", 39, "39"],
359+
["spowelljr", 41, "41"],
360360

361361
]);
362362

@@ -393,21 +393,21 @@ <h3>Most Active</h3>
393393
function drawcomments() {
394394
var data = new google.visualization.arrayToDataTable([
395395
[{label:'',type:'string'},{label: '# of comments', type: 'number'}, { role: 'annotation' }],
396-
["afbjorklund", 168, "168"],
396+
["afbjorklund", 182, "182"],
397397
["spowelljr", 75, "75"],
398398
["kundan2707", 36, "36"],
399-
["medyagh", 17, "17"],
399+
["medyagh", 19, "19"],
400400
["BenTheElder", 12, "12"],
401+
["mprimeaux", 10, "10"],
401402
["ComradeProgrammer", 10, "10"],
402-
["mprimeaux", 9, "9"],
403403
["prezha", 9, "9"],
404404
["nirs", 8, "8"],
405405
["torenware", 8, "8"],
406406
["lbogdan", 8, "8"],
407-
["kant777", 6, "6"],
408-
["mqasimsarfraz", 6, "6"],
409-
["termdew", 6, "6"],
407+
["uos-ljtian", 8, "8"],
410408
["sftim", 6, "6"],
409+
["termdew", 6, "6"],
410+
["kant777", 6, "6"],
411411

412412
]);
413413

@@ -440,21 +440,21 @@ <h3>Most Helpful</h3>
440440
function drawcommentWords() {
441441
var data = new google.visualization.arrayToDataTable([
442442
[{label:'',type:'string'},{label: '# of words (excludes authored)', type: 'number'}, { role: 'annotation' }],
443-
["afbjorklund", 7512, "7512"],
443+
["afbjorklund", 7931, "7931"],
444444
["spowelljr", 3935, "3935"],
445445
["prasanna-desikank", 2363, "2363"],
446446
["pluveto", 1042, "1042"],
447447
["BenTheElder", 1024, "1024"],
448-
["mprimeaux", 985, "985"],
448+
["mprimeaux", 1014, "1014"],
449449
["prezha", 963, "963"],
450450
["ShardulPrabhu", 783, "783"],
451451
["x7upLime", 775, "775"],
452452
["torenware", 747, "747"],
453453
["nirs", 638, "638"],
454454
["lbogdan", 471, "471"],
455455
["jackjie2016", 469, "469"],
456+
["medyagh", 462, "462"],
456457
["blacksd", 448, "448"],
457-
["FlyFlame", 443, "443"],
458458

459459
]);
460460

@@ -487,8 +487,8 @@ <h3>Top Closers</h3>
487487
function drawissueCloser() {
488488
var data = new google.visualization.arrayToDataTable([
489489
[{label:'',type:'string'},{label: '# of issues closed (excludes authored)', type: 'number'}, { role: 'annotation' }],
490-
["spowelljr", 59, "59"],
491-
["medyagh", 31, "31"],
490+
["spowelljr", 63, "63"],
491+
["medyagh", 33, "33"],
492492
["afbjorklund", 5, "5"],
493493

494494
]);

0 commit comments

Comments
 (0)