From f47ab9c58a65678a36dc986a3608ee92c5cdf55a Mon Sep 17 00:00:00 2001 From: Xuecheng Zhang Date: Thu, 14 Nov 2024 16:24:06 +0800 Subject: [PATCH] sec: bump some go mod and binaries (#5950) --- go.mod | 2 +- go.sum | 4 ++-- images/tidb-backup-manager/Dockerfile | 4 ++-- images/tidb-backup-manager/Dockerfile.e2e | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 9af9b5f4408..70f6e909f78 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( go.etcd.io/etcd/api/v3 v3.5.16 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.21.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect diff --git a/go.sum b/go.sum index c2af4cd4dc9..0a3c1da391a 100644 --- a/go.sum +++ b/go.sum @@ -782,8 +782,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile index b4f3a0ee954..d0d80ebf542 100644 --- a/images/tidb-backup-manager/Dockerfile +++ b/images/tidb-backup-manager/Dockerfile @@ -1,7 +1,7 @@ FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.2 ARG TARGETARCH -ARG RCLONE_VERSION=v1.57.0 -ARG SHUSH_VERSION=v1.4.0 +ARG RCLONE_VERSION=v1.68.1 +ARG SHUSH_VERSION=v1.5.5 ARG TOOLKIT_VERSION=v8.1.0 RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all diff --git a/images/tidb-backup-manager/Dockerfile.e2e b/images/tidb-backup-manager/Dockerfile.e2e index a825846b37d..8667834e388 100644 --- a/images/tidb-backup-manager/Dockerfile.e2e +++ b/images/tidb-backup-manager/Dockerfile.e2e @@ -1,8 +1,8 @@ FROM ghcr.io/pingcap-qe/bases/pingcap-base:v1.9.2 ARG TARGETARCH=amd64 -ARG RCLONE_VERSION=v1.57.0 -ARG SHUSH_VERSION=v1.4.0 -ARG TOOLKIT_VERSION=v6.1.0 +ARG RCLONE_VERSION=v1.68.1 +ARG SHUSH_VERSION=v1.5.5 +ARG TOOLKIT_VERSION=v8.1.0 RUN dnf install -y ca-certificates bind-utils wget nc unzip && dnf clean all RUN wget -nv https://github.com/ncw/rclone/releases/download/${RCLONE_VERSION}/rclone-${RCLONE_VERSION}-linux-${TARGETARCH}.zip \