Skip to content

Commit 12869c9

Browse files
inozemtsev-romaninozemtsev-roman
authored
Merge pull request #5 from kubernetes/master
[pull] master from kubernetes:master
2 parents 4c44601 + 24e8941 commit 12869c9

File tree

11 files changed

+117
-92
lines changed

11 files changed

+117
-92
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
echo workspace $GITHUB_WORKSPACE
4141
echo "end of debug stuff"
4242
echo $(which jq)
43-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
43+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
4444
with:
4545
name: minikube_binaries
4646
path: out

‎.github/workflows/functional_verified.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
sudo apt-get install -y libvirt-dev
4848
MINIKUBE_BUILD_IN_DOCKER=y make e2e-linux-arm64
4949
cp -r test/integration/testdata ./out
50-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
50+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
5151
with:
5252
name: minikube_binaries
5353
path: out
@@ -165,7 +165,7 @@ jobs:
165165
echo "${STAT}" >> $GITHUB_ENV
166166
echo 'EOF' >> $GITHUB_ENV
167167
168-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
168+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
169169
with:
170170
name: functional_docker_ubuntu_arm64
171171
path: minikube_binaries/report
@@ -209,7 +209,7 @@ jobs:
209209
run: |
210210
mkdir -p all_reports
211211
cp -r ./functional_docker_ubuntu_arm64 ./all_reports/
212-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
212+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
213213
with:
214214
name: all_reports
215215
path: all_reports

‎.github/workflows/master.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
echo workspace $GITHUB_WORKSPACE
4444
echo "end of debug stuff"
4545
echo $(which jq)
46-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
46+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
4747
with:
4848
name: minikube_binaries
4949
path: out
@@ -179,7 +179,7 @@ jobs:
179179
echo 'STAT<<EOF' >> $GITHUB_ENV
180180
echo "${STAT}" >> $GITHUB_ENV
181181
echo 'EOF' >> $GITHUB_ENV
182-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
182+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
183183
with:
184184
name: functional_docker_ubuntu
185185
path: minikube_binaries/report
@@ -277,7 +277,7 @@ jobs:
277277
echo 'STAT<<EOF' >> $GITHUB_ENV
278278
echo "${STAT}" >> $GITHUB_ENV
279279
echo 'EOF' >> $GITHUB_ENV
280-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
280+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
281281
with:
282282
name: functional_docker_containerd_ubuntu
283283
path: minikube_binaries/report
@@ -379,7 +379,7 @@ jobs:
379379
echo 'STAT<<EOF' >> $GITHUB_ENV
380380
echo "${STAT}" >> $GITHUB_ENV
381381
echo 'EOF' >> $GITHUB_ENV
382-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
382+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
383383
with:
384384
name: functional_podman_ubuntu
385385
path: minikube_binaries/report
@@ -477,7 +477,7 @@ jobs:
477477
echo 'STAT<<EOF' >> $GITHUB_ENV
478478
echo "${STAT}" >> $GITHUB_ENV
479479
echo 'EOF' >> $GITHUB_ENV
480-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
480+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
481481
with:
482482
name: functional_virtualbox_macos
483483
path: minikube_binaries/report
@@ -582,7 +582,7 @@ jobs:
582582
echo 'STAT<<EOF' >> $GITHUB_ENV
583583
echo "${STAT}" >> $GITHUB_ENV
584584
echo 'EOF' >> $GITHUB_ENV
585-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
585+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
586586
with:
587587
name: functional_baremetal_ubuntu20_04
588588
path: minikube_binaries/report
@@ -632,7 +632,7 @@ jobs:
632632
cp -r ./functional_virtualbox_macos ./all_reports/
633633
cp -r ./functional_baremetal_ubuntu20_04 ./all_reports/
634634
635-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
635+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
636636
with:
637637
name: all_reports
638638
path: all_reports

‎.github/workflows/pr.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
echo workspace $GITHUB_WORKSPACE
4242
echo "end of debug stuff"
4343
echo $(which jq)
44-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
44+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
4545
with:
4646
name: minikube_binaries
4747
path: out
@@ -178,7 +178,7 @@ jobs:
178178
echo 'STAT<<EOF' >> $GITHUB_ENV
179179
echo "${STAT}" >> $GITHUB_ENV
180180
echo 'EOF' >> $GITHUB_ENV
181-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
181+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
182182
with:
183183
name: functional_docker_ubuntu
184184
path: minikube_binaries/report
@@ -277,7 +277,7 @@ jobs:
277277
echo 'STAT<<EOF' >> $GITHUB_ENV
278278
echo "${STAT}" >> $GITHUB_ENV
279279
echo 'EOF' >> $GITHUB_ENV
280-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
280+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
281281
with:
282282
name: functional_docker_containerd_ubuntu
283283
path: minikube_binaries/report
@@ -394,7 +394,7 @@ jobs:
394394
echo 'STAT<<EOF' >> $GITHUB_ENV
395395
echo "${STAT}" >> $GITHUB_ENV
396396
echo 'EOF' >> $GITHUB_ENV
397-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
397+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
398398
with:
399399
name: functional_docker_rootless_containerd_ubuntu
400400
path: minikube_binaries/report
@@ -497,7 +497,7 @@ jobs:
497497
echo 'STAT<<EOF' >> $GITHUB_ENV
498498
echo "${STAT}" >> $GITHUB_ENV
499499
echo 'EOF' >> $GITHUB_ENV
500-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
500+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
501501
with:
502502
name: functional_podman_ubuntu
503503
path: minikube_binaries/report
@@ -596,7 +596,7 @@ jobs:
596596
echo 'STAT<<EOF' >> $GITHUB_ENV
597597
echo "${STAT}" >> $GITHUB_ENV
598598
echo 'EOF' >> $GITHUB_ENV
599-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
599+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
600600
with:
601601
name: functional_virtualbox_macos
602602
path: minikube_binaries/report
@@ -702,7 +702,7 @@ jobs:
702702
echo 'STAT<<EOF' >> $GITHUB_ENV
703703
echo "${STAT}" >> $GITHUB_ENV
704704
echo 'EOF' >> $GITHUB_ENV
705-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
705+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
706706
with:
707707
name: functional_baremetal_ubuntu20_04
708708
path: minikube_binaries/report
@@ -754,7 +754,7 @@ jobs:
754754
cp -r ./functional_virtualbox_macos ./all_reports/
755755
cp -r ./functional_baremetal_ubuntu20_04 ./all_reports/
756756
757-
- uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6
757+
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
758758
with:
759759
name: all_reports
760760
path: all_reports

‎go.mod

+20-20
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ module k8s.io/minikube
33
go 1.21
44

55
require (
6-
cloud.google.com/go/storage v1.36.0
6+
cloud.google.com/go/storage v1.37.0
77
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
88
github.com/Delta456/box-cli-maker/v2 v2.3.0
9-
github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.15
9+
github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.16
1010
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.21.0
1111
github.com/Parallels/docker-machine-parallels/v2 v2.0.1
1212
github.com/VividCortex/godaemon v1.0.0
1313
github.com/Xuanwo/go-locale v1.1.0
1414
github.com/blang/semver/v4 v4.0.0
1515
github.com/briandowns/spinner v1.11.1
1616
github.com/cenkalti/backoff/v4 v4.2.1
17-
github.com/cheggaaa/pb/v3 v3.1.4
18-
github.com/cloudevents/sdk-go/v2 v2.14.0
17+
github.com/cheggaaa/pb/v3 v3.1.5
18+
github.com/cloudevents/sdk-go/v2 v2.15.0
1919
github.com/docker/cli v24.0.7+incompatible
2020
github.com/docker/docker v24.0.7+incompatible
2121
github.com/docker/go-connections v0.5.0
@@ -24,10 +24,10 @@ require (
2424
github.com/elazarl/goproxy v0.0.0-20210110162100-a92cc753f88e
2525
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
2626
github.com/google/go-cmp v0.6.0
27-
github.com/google/go-containerregistry v0.17.0
27+
github.com/google/go-containerregistry v0.18.0
2828
github.com/google/go-github/v58 v58.0.0
2929
github.com/google/slowjam v1.1.0
30-
github.com/google/uuid v1.5.0
30+
github.com/google/uuid v1.6.0
3131
github.com/hashicorp/go-getter v1.7.3
3232
github.com/hashicorp/go-retryablehttp v0.7.5
3333
github.com/hooklift/iso9660 v1.0.0
@@ -61,9 +61,9 @@ require (
6161
github.com/spf13/viper v1.18.2
6262
github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
6363
go.opencensus.io v0.24.0
64-
go.opentelemetry.io/otel v1.21.0
65-
go.opentelemetry.io/otel/sdk v1.21.0
66-
go.opentelemetry.io/otel/trace v1.21.0
64+
go.opentelemetry.io/otel v1.22.0
65+
go.opentelemetry.io/otel/sdk v1.22.0
66+
go.opentelemetry.io/otel/trace v1.22.0
6767
golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
6868
golang.org/x/crypto v0.18.0
6969
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
@@ -74,22 +74,22 @@ require (
7474
golang.org/x/term v0.16.0
7575
golang.org/x/text v0.14.0
7676
gonum.org/v1/plot v0.14.0
77-
google.golang.org/api v0.157.0
77+
google.golang.org/api v0.159.0
7878
gopkg.in/yaml.v2 v2.4.0
7979
k8s.io/api v0.29.1
8080
k8s.io/apimachinery v0.29.1
8181
k8s.io/client-go v0.29.1
8282
k8s.io/cluster-bootstrap v0.0.0
8383
k8s.io/component-base v0.29.1
84-
k8s.io/klog/v2 v2.120.0
85-
k8s.io/kubectl v0.29.0
84+
k8s.io/klog/v2 v2.120.1
85+
k8s.io/kubectl v0.29.1
8686
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
8787
libvirt.org/go/libvirt v1.9008.0
8888
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
8989
)
9090

9191
require (
92-
cloud.google.com/go v0.111.0 // indirect
92+
cloud.google.com/go v0.112.0 // indirect
9393
cloud.google.com/go/compute v1.23.3 // indirect
9494
cloud.google.com/go/compute/metadata v0.2.3 // indirect
9595
cloud.google.com/go/iam v1.1.5 // indirect
@@ -168,7 +168,7 @@ require (
168168
github.com/magiconair/properties v1.8.7 // indirect
169169
github.com/mailru/easyjson v0.7.7 // indirect
170170
github.com/mattn/go-colorable v0.1.13 // indirect
171-
github.com/mattn/go-runewidth v0.0.14 // indirect
171+
github.com/mattn/go-runewidth v0.0.15 // indirect
172172
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
173173
github.com/miekg/dns v1.1.48 // indirect
174174
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -210,25 +210,25 @@ require (
210210
github.com/vbatts/tar-split v0.11.3 // indirect
211211
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
212212
github.com/yusufpapurcu/wmi v1.2.3 // indirect
213-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
214-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
215-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
213+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
214+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
215+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
216216
go.uber.org/multierr v1.11.0 // indirect
217217
go.uber.org/zap v1.26.0 // indirect
218218
golang.org/x/image v0.11.0 // indirect
219219
golang.org/x/net v0.20.0 // indirect
220220
golang.org/x/time v0.5.0 // indirect
221221
golang.org/x/tools v0.16.1 // indirect
222222
google.golang.org/appengine v1.6.8 // indirect
223-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
224-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
223+
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
224+
google.golang.org/genproto/googleapis/api v0.0.0-20240122161410-6c6643bf1457 // indirect
225225
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
226226
google.golang.org/grpc v1.60.1 // indirect
227227
google.golang.org/protobuf v1.32.0 // indirect
228228
gopkg.in/inf.v0 v0.9.1 // indirect
229229
gopkg.in/ini.v1 v1.67.0 // indirect
230230
gopkg.in/yaml.v3 v3.0.1 // indirect
231-
k8s.io/cli-runtime v0.29.0 // indirect
231+
k8s.io/cli-runtime v0.29.1 // indirect
232232
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
233233
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
234234
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)