Skip to content

Commit 995898b

Browse files
committed
Use exit code for route command success check on Windows
The tunnel route command on Windows can fail when a route already exists. Instead of parsing stderr output, check the command exit code directly for more reliable success detection. Also handle the 'route already exists' case gracefully by treating it as a non-fatal condition.
1 parent 799c248 commit 995898b

29 files changed

Lines changed: 277 additions & 305 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo workspace $GITHUB_WORKSPACE
4040
echo "end of debug stuff"
4141
echo $(which jq)
42-
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
42+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
4343
with:
4444
name: minikube_binaries
4545
path: out

.github/workflows/functional_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
make ${{ matrix.make-targets }}
6161
cp -r test/integration/testdata ./out
6262
- name: Upload Test Binaries
63-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a
63+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
6464
with:
6565
name: binaries-${{ matrix.arch }}
6666
path: out
@@ -258,7 +258,7 @@ jobs:
258258
echo "=== podman ps ==="
259259
podman ps || true
260260
- name: Install kubectl
261-
uses: azure/setup-kubectl@v5
261+
uses: azure/setup-kubectl@v4
262262
- name: Install qemu and socket_vmnet (macos)
263263
if: contains(matrix.os, 'macos') && matrix.driver == 'qemu'
264264
run: |
@@ -270,7 +270,7 @@ jobs:
270270
brew install vfkit
271271
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
272272
- name: Download Test Binaries
273-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
273+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
274274
with:
275275
name: binaries-${{ matrix.arch }}
276276
- name: Disable AppArmor for MySQL

cmd/minikube/cmd/config/kubernetes_version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"net/http"
2222

23-
"github.com/google/go-github/v84/github"
23+
"github.com/google/go-github/v83/github"
2424
"golang.org/x/mod/semver"
2525
"k8s.io/minikube/pkg/minikube/constants"
2626
)

deploy/kicbase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020

2121
# this ARG needs to be global to use it in `FROM` & is updated for new versions of debian:bookworm-slim-*
22-
ARG KICBASE_IMAGE="debian:bookworm-20260223-slim"
22+
ARG KICBASE_IMAGE="debian:bookworm-20260202-slim"
2323
# start from debin 12, this image is reasonably small as a starting point
2424
# for a kubernetes node image, it doesn't contain much we don't need
2525
FROM ${KICBASE_IMAGE} AS kicbase

go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/gofrs/flock v0.13.0
2626
github.com/google/go-cmp v0.7.0
2727
github.com/google/go-containerregistry v0.20.7
28-
github.com/google/go-github/v84 v84.0.0
28+
github.com/google/go-github/v83 v83.0.0
2929
github.com/google/slowjam v1.1.2
3030
github.com/google/uuid v1.6.0
3131
github.com/hashicorp/go-getter v1.8.4
@@ -67,7 +67,7 @@ require (
6767
golang.org/x/sys v0.41.0
6868
golang.org/x/term v0.40.0
6969
golang.org/x/text v0.34.0
70-
google.golang.org/api v0.269.0
70+
google.golang.org/api v0.268.0
7171
gopkg.in/yaml.v2 v2.4.0
7272
k8s.io/api v0.35.1
7373
k8s.io/apimachinery v0.35.1
@@ -82,9 +82,9 @@ require (
8282
)
8383

8484
require (
85-
cel.dev/expr v0.25.1 // indirect
85+
cel.dev/expr v0.24.0 // indirect
8686
cloud.google.com/go v0.123.0 // indirect
87-
cloud.google.com/go/auth v0.18.2 // indirect
87+
cloud.google.com/go/auth v0.18.1 // indirect
8888
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
8989
cloud.google.com/go/compute/metadata v0.9.0 // indirect
9090
cloud.google.com/go/iam v1.5.3 // indirect
@@ -98,32 +98,32 @@ require (
9898
github.com/Microsoft/go-winio v0.6.2 // indirect
9999
github.com/VividCortex/ewma v1.2.0 // indirect
100100
github.com/anchore/go-lzo v0.1.0 // indirect
101-
github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect
102-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
101+
github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
102+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
103103
github.com/aws/aws-sdk-go-v2/config v1.32.6 // indirect
104104
github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect
105105
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
106-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
107-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
106+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
107+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
108108
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
109-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.22 // indirect
110-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
111-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
112-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
113-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
114-
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3 // indirect
109+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
110+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
111+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
112+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
113+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
114+
github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0 // indirect
115115
github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
116116
github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
117117
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
118118
github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
119-
github.com/aws/smithy-go v1.24.2 // indirect
119+
github.com/aws/smithy-go v1.24.0 // indirect
120120
github.com/beorn7/perks v1.0.1 // indirect
121121
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
122122
github.com/cespare/xxhash/v2 v2.3.0 // indirect
123123
github.com/clipperhouse/displaywidth v0.6.2 // indirect
124124
github.com/clipperhouse/stringish v0.1.1 // indirect
125125
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
126-
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
126+
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
127127
github.com/containerd/errdefs/pkg v0.3.0 // indirect
128128
github.com/containerd/log v0.1.0 // indirect
129129
github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
@@ -136,16 +136,16 @@ require (
136136
github.com/ebitengine/purego v0.9.1 // indirect
137137
github.com/elliotwutingfeng/asciiset v0.0.0-20230602022725-51bbb787efab // indirect
138138
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
139-
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
140-
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
139+
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
140+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
141141
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
142142
github.com/fatih/color v1.18.0 // indirect
143143
github.com/felixge/fgprof v0.9.3 // indirect
144144
github.com/felixge/httpsnoop v1.0.4 // indirect
145145
github.com/fsnotify/fsnotify v1.9.0 // indirect
146146
github.com/fvbommel/sortorder v1.1.0 // indirect
147147
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
148-
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
148+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
149149
github.com/go-logr/logr v1.4.3 // indirect
150150
github.com/go-logr/stdr v1.2.2 // indirect
151151
github.com/go-ole/go-ole v1.2.6 // indirect
@@ -158,7 +158,7 @@ require (
158158
github.com/google/go-querystring v1.2.0 // indirect
159159
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
160160
github.com/google/s2a-go v0.1.9 // indirect
161-
github.com/googleapis/enterprise-certificate-proxy v0.3.12 // indirect
161+
github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect
162162
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
163163
github.com/gookit/color v1.5.2 // indirect
164164
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.70 // indirect
@@ -222,7 +222,7 @@ require (
222222
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
223223
github.com/yusufpapurcu/wmi v1.2.4 // indirect
224224
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
225-
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
225+
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
226226
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
227227
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
228228
go.opentelemetry.io/otel/metric v1.40.0 // indirect
@@ -231,13 +231,13 @@ require (
231231
go.uber.org/zap v1.27.0 // indirect
232232
go.yaml.in/yaml/v2 v2.4.3 // indirect
233233
go.yaml.in/yaml/v3 v3.0.4 // indirect
234-
golang.org/x/net v0.50.0 // indirect
234+
golang.org/x/net v0.49.0 // indirect
235235
golang.org/x/time v0.14.0 // indirect
236236
golang.org/x/tools v0.41.0 // indirect
237237
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect
238238
google.golang.org/genproto/googleapis/api v0.0.0-20260203192932-546029d2fa20 // indirect
239-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
240-
google.golang.org/grpc v1.79.3 // indirect
239+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect
240+
google.golang.org/grpc v1.78.0 // indirect
241241
google.golang.org/protobuf v1.36.11 // indirect
242242
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
243243
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)