Skip to content

Commit f8b26b5

Browse files
fix(deps): update module go.opentelemetry.io/otel/sdk to v1.43.0 [security] (alauda-1.18) - abandoned (#168)
* chore: fix vulns * chore: rebuild test image * chore: fix vulns * chore: fix vulns * chore: fix vulns * chore: fix vulns * chore: rebuild test image --------- Co-authored-by: yuzichen <1062955096@qq.com>
1 parent d468811 commit f8b26b5

16 files changed

Lines changed: 139 additions & 144 deletions

.tekton/all-in-one.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,13 @@ spec:
200200
# download trivy and scanner-trivy
201201
202202
# renovate: datasource=github-releases depName=trivy packageName=AlaudaDevops/trivy
203-
TRIVY_VERSION=v0.66.1-alauda-11
203+
TRIVY_VERSION=v0.66.1-alauda-15
204204
205205
# renovate: datasource=github-releases depName=harbor-scanner-trivy packageName=AlaudaDevops/harbor-scanner-trivy
206-
TRIVY_ADAPTER_VERSION=v0.34.2-alauda-6
206+
TRIVY_ADAPTER_VERSION=v0.34.2-alauda-7
207207
208208
# renovate: datasource=golang-version depName=go
209-
export GOLANG_IMAGE_VERSION=1.26.1
209+
export GOLANG_IMAGE_VERSION=1.26.2
210210
211211
TRIVY_DOWNLOAD_URL=https://github.com/AlaudaDevops/trivy/releases/download/${TRIVY_VERSION}/trivy_Linux_${ARCH}.tar.gz
212212
TRIVY_ADAPTER_DOWNLOAD_URL=https://github.com/AlaudaDevops/harbor-scanner-trivy/releases/download/${TRIVY_ADAPTER_VERSION}/harbor-scanner-trivy_${TRIVY_ADAPTER_VERSION#v}_Linux_${ARCH}.tar.gz

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"ignorePaths": [
1717
"subtree/**/*Dockerfile*",
18-
"testing/**/*Containerfile*"
18+
"testing/**"
1919
],
2020
"customManagers": [
2121
{

subtree/harbor/make/patches/patch-amd64.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ change_base_image () {
99
change_base_image $1"/"$file
1010
elif [[ $file == *Dockerfile* ]]
1111
then
12-
sed -i 's/photon:5.0/build-harbor.alauda.cn\/ops\/photon:5-alauda-202602261100/' $1"/"$file
12+
sed -i 's/photon:5.0/build-harbor.alauda.cn\/ops\/photon:5-alauda-202604171100/' $1"/"$file
1313

1414
echo $1"/"$file
1515
elif [[ $file == "docker-healthcheck.sh" ]]
@@ -24,7 +24,7 @@ change_base_image "make/photon"
2424
# swagger
2525

2626
# renovate: datasource=golang-version depName=go
27-
export GOLANG_IMAGE_VERSION=1.26.1
27+
export GOLANG_IMAGE_VERSION=1.26.2
2828

2929
sed -i 's/node:16.18.0/docker-mirrors.alauda.cn\/library\/node:16.18.0/' "Makefile"
3030
sed -i 's/registry.npmjs.org/internal-mirrors.alauda.cn\/repository\/npm\//g' "Makefile"

subtree/harbor/src/go.mod

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
github.com/opencontainers/go-digest v1.0.0
5050
github.com/opencontainers/image-spec v1.1.1
5151
github.com/pkg/errors v0.9.1
52-
github.com/prometheus/client_golang v1.22.0
52+
github.com/prometheus/client_golang v1.23.2
5353
github.com/prometheus/client_model v0.6.2
5454
github.com/robfig/cron/v3 v3.0.1
5555
github.com/spf13/viper v1.19.0
@@ -58,31 +58,31 @@ require (
5858
github.com/vmihailenco/msgpack/v5 v5.4.1
5959
github.com/volcengine/volcengine-go-sdk v1.1.29
6060
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.59.0
61-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
62-
go.opentelemetry.io/otel v1.40.0
61+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0
62+
go.opentelemetry.io/otel v1.43.0
6363
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
64-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0
65-
go.opentelemetry.io/otel/sdk v1.40.0
66-
go.opentelemetry.io/otel/trace v1.40.0
64+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0
65+
go.opentelemetry.io/otel/sdk v1.43.0
66+
go.opentelemetry.io/otel/trace v1.43.0
6767
go.pinniped.dev v0.37.0
6868
go.uber.org/ratelimit v0.3.1
69-
golang.org/x/crypto v0.45.0
70-
golang.org/x/net v0.47.0
71-
golang.org/x/oauth2 v0.28.0
72-
golang.org/x/sync v0.18.0
73-
golang.org/x/text v0.31.0
69+
golang.org/x/crypto v0.49.0
70+
golang.org/x/net v0.52.0
71+
golang.org/x/oauth2 v0.35.0
72+
golang.org/x/sync v0.20.0
73+
golang.org/x/text v0.35.0
7474
golang.org/x/time v0.12.0
7575
gopkg.in/h2non/gock.v1 v1.1.2
7676
gopkg.in/yaml.v2 v2.4.0
77-
helm.sh/helm/v3 v3.18.5
78-
k8s.io/api v0.34.1
79-
k8s.io/apimachinery v0.34.1
80-
k8s.io/client-go v0.34.1
77+
helm.sh/helm/v3 v3.20.2
78+
k8s.io/api v0.35.1
79+
k8s.io/apimachinery v0.35.1
80+
k8s.io/client-go v0.35.1
8181
sigs.k8s.io/yaml v1.6.0
8282
)
8383

8484
require (
85-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
85+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
8686
github.com/Azure/azure-sdk-for-go v37.2.0+incompatible // indirect
8787
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
8888
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
@@ -93,10 +93,11 @@ require (
9393
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
9494
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
9595
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
96-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
96+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
9797
github.com/Unknwon/goconfig v0.0.0-20160216183935-5f601ca6ef4d // indirect
9898
github.com/benbjohnson/clock v1.3.0 // indirect
9999
github.com/beorn7/perks v1.0.1 // indirect
100+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
100101
github.com/cespare/xxhash/v2 v2.3.0 // indirect
101102
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
102103
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -109,16 +110,15 @@ require (
109110
github.com/felixge/httpsnoop v1.0.4 // indirect
110111
github.com/fsnotify/fsnotify v1.8.0 // indirect
111112
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
112-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
113+
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
113114
github.com/go-logr/logr v1.4.3 // indirect
114115
github.com/go-logr/stdr v1.2.2 // indirect
115116
github.com/go-openapi/analysis v0.23.0 // indirect
116117
github.com/go-openapi/jsonpointer v0.21.0 // indirect
117118
github.com/go-openapi/jsonreference v0.21.0 // indirect
118-
github.com/gogo/protobuf v1.3.2 // indirect
119119
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
120120
github.com/google/go-querystring v1.1.0 // indirect
121-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
121+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
122122
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
123123
github.com/hashicorp/errwrap v1.1.0 // indirect
124124
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -128,7 +128,7 @@ require (
128128
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa // indirect
129129
github.com/jackc/pgio v1.0.0 // indirect
130130
github.com/jackc/pgpassfile v1.0.0 // indirect
131-
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
131+
github.com/jackc/pgproto3/v2 v2.3.4-0.20250125160525-bc041643406d // indirect
132132
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
133133
github.com/jackc/pgtype v1.14.0 // indirect
134134
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -148,8 +148,8 @@ require (
148148
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
149149
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
150150
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
151-
github.com/prometheus/common v0.62.0 // indirect
152-
github.com/prometheus/procfs v0.15.1 // indirect
151+
github.com/prometheus/common v0.66.1 // indirect
152+
github.com/prometheus/procfs v0.16.1 // indirect
153153
github.com/robfig/cron v1.0.0 // indirect
154154
github.com/sagikazarmark/locafero v0.4.0 // indirect
155155
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -160,7 +160,7 @@ require (
160160
github.com/sourcegraph/conc v0.3.0 // indirect
161161
github.com/spf13/afero v1.11.0 // indirect
162162
github.com/spf13/cast v1.7.0 // indirect
163-
github.com/spf13/pflag v1.0.7 // indirect
163+
github.com/spf13/pflag v1.0.10 // indirect
164164
github.com/stretchr/objx v0.5.2 // indirect
165165
github.com/subosito/gotenv v1.6.0 // indirect
166166
github.com/valyala/bytebufferpool v1.0.0 // indirect
@@ -170,28 +170,29 @@ require (
170170
github.com/x448/float16 v0.8.4 // indirect
171171
go.mongodb.org/mongo-driver v1.14.0 // indirect
172172
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
173-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
174-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
175-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
173+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
174+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
175+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
176176
go.uber.org/atomic v1.9.0 // indirect
177177
go.uber.org/multierr v1.11.0 // indirect
178178
go.uber.org/zap v1.27.0 // indirect
179-
go.yaml.in/yaml/v2 v2.4.2 // indirect
179+
go.yaml.in/yaml/v2 v2.4.3 // indirect
180180
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
181-
golang.org/x/sys v0.40.0 // indirect
182-
golang.org/x/term v0.37.0 // indirect
181+
golang.org/x/sys v0.42.0 // indirect
182+
golang.org/x/term v0.41.0 // indirect
183183
google.golang.org/api v0.171.0 // indirect
184184
google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 // indirect
185-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
186-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
187-
google.golang.org/grpc v1.69.4 // indirect
188-
google.golang.org/protobuf v1.36.6 // indirect
185+
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
186+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
187+
google.golang.org/grpc v1.80.0 // indirect
188+
google.golang.org/protobuf v1.36.11 // indirect
189189
gopkg.in/inf.v0 v0.9.1 // indirect
190190
gopkg.in/ini.v1 v1.67.0 // indirect
191191
gopkg.in/yaml.v3 v3.0.1 // indirect
192192
k8s.io/klog/v2 v2.130.1 // indirect
193-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
194-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
193+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
194+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
195+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
195196
sigs.k8s.io/randfill v1.0.0 // indirect
196197
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
197198
)

0 commit comments

Comments
 (0)