Skip to content

Commit 0f78283

Browse files
chandler-solochandler-solo
authored
bump: Bumps many deps with known vulnerabilities (#13899)
Signed-off-by: David L. Chandler <david.chandler@solo.io>
1 parent 99ddbe9 commit 0f78283

25 files changed

Lines changed: 787 additions & 744 deletions

‎.github/workflows/lint.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@ jobs:
5959
steps:
6060
- name: Checkout repository
6161
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
62+
- name: Read Rust toolchain version
63+
id: rust
64+
run: echo "channel=$(awk -F'"' '/^channel[[:space:]]*=/ {print $2}' internal/envoy_modules/rust-toolchain.toml)" >> "$GITHUB_OUTPUT"
6265
- name: Install Rust
6366
uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4
6467
with:
65-
toolchain: 1.86.0
68+
toolchain: ${{ steps.rust.outputs.channel }}
6669
components: clippy,rustfmt
6770
cache: true
6871
- name: Lint

‎cmd/envoyinit/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ RUN sed -i 's|http://archive.ubuntu.com|http://azure.archive.ubuntu.com|g; s|htt
1313
&& apt-get -o Acquire::Retries=5 update \
1414
&& apt-get -o Acquire::Retries=5 install --no-install-recommends -y clang
1515
ARG ENVOY_MODULES_DIR=./envoy_modules
16+
# Copy rust-toolchain.toml first so rustup auto-installs the pinned toolchain
17+
# (single source of truth for Rust version; see tools/build-tools/Dockerfile and
18+
# .github/workflows/lint.yaml which also read this file).
19+
COPY ${ENVOY_MODULES_DIR}/rust-toolchain.toml ./
1620
COPY ${ENVOY_MODULES_DIR}/Cargo.toml ${ENVOY_MODULES_DIR}/Cargo.lock ./
1721
# Workspace crate members are auto-discovered from ${ENVOY_MODULES_DIR}/Cargo.toml.
1822
# To add a crate, add it to the workspace members list in internal/envoy_modules/Cargo.toml.

‎cmd/envoyinit/Dockerfile.tmpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ RUN sed -i 's|http://archive.ubuntu.com|http://azure.archive.ubuntu.com|g; s|htt
88
&& apt-get -o Acquire::Retries=5 update \
99
&& apt-get -o Acquire::Retries=5 install --no-install-recommends -y clang
1010
ARG ENVOY_MODULES_DIR=./envoy_modules
11+
# Copy rust-toolchain.toml first so rustup auto-installs the pinned toolchain
12+
# (single source of truth for Rust version; see tools/build-tools/Dockerfile and
13+
# .github/workflows/lint.yaml which also read this file).
14+
COPY ${ENVOY_MODULES_DIR}/rust-toolchain.toml ./
1115
COPY ${ENVOY_MODULES_DIR}/Cargo.toml ${ENVOY_MODULES_DIR}/Cargo.lock ./
1216
# Workspace crate members are auto-discovered from ${ENVOY_MODULES_DIR}/Cargo.toml.
1317
# To add a crate, add it to the workspace members list in internal/envoy_modules/Cargo.toml.

‎cmd/envoyinit/generate-dockerfile.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ get_lib_name() {
4545
}
4646

4747
# is_cdylib <cargo_toml> — returns 0 (true) if crate produces a .so
48+
# Use -E (ERE) so '|' alternation works under both GNU and BSD grep (macOS).
4849
is_cdylib() {
49-
grep -q 'crate-type.*cdylib\|cdylib.*crate-type' "$1"
50+
grep -Eq 'crate-type.*cdylib|cdylib.*crate-type' "$1"
5051
}
5152

5253
TMPDIR_GENERATED=$(mktemp -d)

‎go.mod‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.26.2
44

55
require (
66
github.com/avast/retry-go/v4 v4.7.0
7-
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5
7+
github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2
88
github.com/envoyproxy/go-control-plane v0.14.0
9-
github.com/envoyproxy/go-control-plane/contrib v1.36.1-0.20260313105501-0df655d8a214
10-
github.com/envoyproxy/go-control-plane/envoy v1.37.1-0.20260313105501-0df655d8a214
9+
github.com/envoyproxy/go-control-plane/contrib v1.36.1-0.20260418153000-ae8637bdda9d
10+
github.com/envoyproxy/go-control-plane/envoy v1.37.1-0.20260418153000-ae8637bdda9d
1111
github.com/envoyproxy/go-control-plane/ratelimit v0.1.1-0.20250507123352-93990c5ec02f
1212
github.com/fsnotify/fsnotify v1.9.0
1313
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
@@ -18,7 +18,7 @@ require (
1818
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
1919
github.com/kelseyhightower/envconfig v1.4.0
2020
github.com/mitchellh/hashstructure v1.1.0
21-
github.com/onsi/ginkgo/v2 v2.28.0
21+
github.com/onsi/ginkgo/v2 v2.28.1
2222
github.com/onsi/gomega v1.39.1
2323
github.com/prometheus/client_golang v1.23.2
2424
github.com/prometheus/client_model v0.6.2
@@ -28,22 +28,22 @@ require (
2828
github.com/spf13/cobra v1.10.2
2929
github.com/stretchr/testify v1.11.1
3030
go.uber.org/zap v1.27.1
31-
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9
31+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
3232
golang.org/x/net v0.52.0 // indirect
3333
google.golang.org/grpc v1.80.0
3434
google.golang.org/protobuf v1.36.11
3535
helm.sh/helm/v3 v3.20.2
36-
istio.io/api v1.29.0-alpha.0.0.20260315093121-ce7e56c13e1d
37-
istio.io/client-go v1.29.0-alpha.0.0.20260315093321-a99807642da7
38-
istio.io/istio v0.0.0-20260316163420-df8836984470
39-
k8s.io/api v0.35.1
40-
k8s.io/apiextensions-apiserver v0.35.1
41-
k8s.io/apimachinery v0.35.1
42-
k8s.io/client-go v0.35.1
43-
k8s.io/klog/v2 v2.130.1
44-
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
45-
k8s.io/utils v0.0.0-20260108192941-914a6e750570
46-
sigs.k8s.io/controller-runtime v0.23.1
36+
istio.io/api v1.30.0-alpha.1.0.20260415171154-7fa57afdea51
37+
istio.io/client-go v1.30.0-alpha.1.0.20260415171554-0d069047cd3c
38+
istio.io/istio v0.0.0-20260421191718-517aa47d8436
39+
k8s.io/api v0.35.3
40+
k8s.io/apiextensions-apiserver v0.35.3
41+
k8s.io/apimachinery v0.35.3
42+
k8s.io/client-go v0.35.3
43+
k8s.io/klog/v2 v2.140.0
44+
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
45+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
46+
sigs.k8s.io/controller-runtime v0.23.3
4747
sigs.k8s.io/gateway-api v1.5.1
4848
sigs.k8s.io/yaml v1.6.0
4949
)
@@ -74,7 +74,6 @@ require (
7474
github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
7575
github.com/bombsimon/wsl/v5 v5.6.0 // indirect
7676
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
77-
github.com/creack/pty v1.1.24 // indirect
7877
github.com/dlclark/regexp2 v1.11.5 // indirect
7978
github.com/dnephin/pflag v1.0.7 // indirect
8079
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
@@ -115,21 +114,21 @@ require (
115114
go.augendre.info/fatcontext v0.9.0 // indirect
116115
go.opentelemetry.io/contrib/bridges/prometheus v0.65.0 // indirect
117116
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect
117+
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0 // indirect
119118
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.43.0 // indirect
120119
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
121120
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
122121
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
123122
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.43.0 // indirect
124-
go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
123+
go.opentelemetry.io/otel/sdk/log v0.19.0 // indirect
125124
go.yaml.in/yaml/v2 v2.4.4 // indirect
126125
go.yaml.in/yaml/v3 v3.0.4 // indirect
127126
go.yaml.in/yaml/v4 v4.0.0-rc.2 // indirect
128127
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
129128
gotest.tools/gotestsum v1.13.0 // indirect
130129
oras.land/oras-go/v2 v2.6.0 // indirect
131130
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.1 // indirect
132-
sigs.k8s.io/gateway-api-inference-extension v0.0.0-20250926182816-0a3bb2010751 // indirect
131+
sigs.k8s.io/gateway-api-inference-extension v1.4.0 // indirect
133132
)
134133

135134
require (
@@ -192,14 +191,13 @@ require (
192191
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
193192
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
194193
github.com/denis-tingaikin/go-header v0.5.0 // indirect
195-
github.com/docker/docker-credential-helpers v0.9.4 // indirect
196194
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
197195
github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect
198196
github.com/ettle/strcase v0.2.0 // indirect
199197
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
200198
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
201199
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
202-
github.com/fatih/color v1.18.0 // indirect
200+
github.com/fatih/color v1.19.0 // indirect
203201
github.com/fatih/structtag v1.2.0 // indirect
204202
github.com/felixge/httpsnoop v1.0.4 // indirect
205203
github.com/firefart/nonamedreturns v1.0.6 // indirect
@@ -240,9 +238,9 @@ require (
240238
github.com/golangci/revgrep v0.8.0 // indirect
241239
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
242240
github.com/google/btree v1.1.3 // indirect
243-
github.com/google/cel-go v0.26.1
241+
github.com/google/cel-go v0.27.0
244242
github.com/google/gnostic-models v0.7.1 // indirect
245-
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
243+
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef // indirect
246244
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
247245
github.com/google/uuid v1.6.0 // indirect
248246
github.com/gordonklaus/ineffassign v0.2.0 // indirect
@@ -269,7 +267,7 @@ require (
269267
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
270268
github.com/kisielk/errcheck v1.9.0 // indirect
271269
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
272-
github.com/klauspost/compress v1.18.4 // indirect
270+
github.com/klauspost/compress v1.18.5 // indirect
273271
github.com/kulti/thelper v0.7.1 // indirect
274272
github.com/kunwardeep/paralleltest v1.0.15 // indirect
275273
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -344,7 +342,7 @@ require (
344342
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
345343
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
346344
github.com/securego/gosec/v2 v2.22.11 // indirect
347-
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
345+
github.com/sergi/go-diff v1.4.0
348346
github.com/shopspring/decimal v1.4.0 // indirect
349347
github.com/sirupsen/logrus v1.9.4 // indirect
350348
github.com/sivchari/containedctx v1.0.3 // indirect
@@ -355,7 +353,6 @@ require (
355353
github.com/spf13/viper v1.21.0 // indirect
356354
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
357355
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
358-
github.com/stoewer/go-strcase v1.3.1 // indirect
359356
github.com/stretchr/objx v0.5.2 // indirect
360357
github.com/subosito/gotenv v1.6.0 // indirect
361358
github.com/tetafro/godot v1.5.4 // indirect
@@ -391,14 +388,14 @@ require (
391388
go.uber.org/multierr v1.11.0 // indirect
392389
golang.org/x/crypto v0.49.0 // indirect
393390
golang.org/x/exp/typeparams v0.0.0-20251125195548-87e1e737ad39 // indirect
394-
golang.org/x/mod v0.33.0 // indirect
395-
golang.org/x/oauth2 v0.35.0 // indirect
391+
golang.org/x/mod v0.34.0 // indirect
392+
golang.org/x/oauth2 v0.36.0 // indirect
396393
golang.org/x/sync v0.20.0
397394
golang.org/x/sys v0.42.0 // indirect
398395
golang.org/x/term v0.41.0 // indirect
399396
golang.org/x/text v0.35.0 // indirect
400-
golang.org/x/time v0.14.0
401-
golang.org/x/tools v0.42.0 // indirect
397+
golang.org/x/time v0.15.0
398+
golang.org/x/tools v0.43.0 // indirect
402399
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
403400
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
404401
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9
@@ -407,20 +404,20 @@ require (
407404
gopkg.in/yaml.v2 v2.4.0 // indirect
408405
gopkg.in/yaml.v3 v3.0.1 // indirect
409406
honnef.co/go/tools v0.6.1 // indirect
410-
k8s.io/apiserver v0.35.1 // indirect
411-
k8s.io/cli-runtime v0.35.1 // indirect
412-
k8s.io/code-generator v0.35.1 // indirect
413-
k8s.io/component-base v0.35.1 // indirect
407+
k8s.io/apiserver v0.35.3 // indirect
408+
k8s.io/cli-runtime v0.35.3 // indirect
409+
k8s.io/code-generator v0.35.3 // indirect
410+
k8s.io/component-base v0.35.3 // indirect
414411
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
415-
k8s.io/kubectl v0.35.1 // indirect
412+
k8s.io/kubectl v0.35.3 // indirect
416413
mvdan.cc/gofumpt v0.9.2 // indirect
417414
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
418-
sigs.k8s.io/controller-tools v0.19.1-0.20251023132335-bf7d6b742e6a // indirect
415+
sigs.k8s.io/controller-tools v0.20.1 // indirect
419416
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
420417
sigs.k8s.io/kind v0.31.0 // indirect
421-
sigs.k8s.io/kustomize/api v0.20.1 // indirect
422-
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
423-
sigs.k8s.io/mcs-api v0.2.0 // indirect
418+
sigs.k8s.io/kustomize/api v0.21.1 // indirect
419+
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
420+
sigs.k8s.io/mcs-api v0.4.0 // indirect
424421
sigs.k8s.io/randfill v1.0.0 // indirect
425422
)
426423

0 commit comments

Comments
 (0)