Skip to content

Commit 08ea764

Browse files
authored
Merge pull request #254 from blackpiglet/1.14/1.14.1_cves
[1.14] Bump Golang to 1.25.9 and go.mod to fix CVEs.
2 parents 1051f9f + c2ad13b commit 08ea764

3 files changed

Lines changed: 69 additions & 69 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM --platform=$BUILDPLATFORM golang:1.25.7-bookworm AS build
15+
FROM --platform=$BUILDPLATFORM golang:1.25.9-trixie AS build
1616

1717
ARG TARGETOS
1818
ARG TARGETARCH

go.mod

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/vmware-tanzu/velero-plugin-for-gcp
22

3-
go 1.25.7
3+
go 1.25.9
44

55
require (
66
cloud.google.com/go/storage v1.57.2
@@ -10,14 +10,14 @@ require (
1010
github.com/spf13/pflag v1.0.5
1111
github.com/stretchr/testify v1.11.1
1212
github.com/vmware-tanzu/velero v1.18.0
13-
golang.org/x/oauth2 v0.33.0
13+
golang.org/x/oauth2 v0.34.0
1414
google.golang.org/api v0.256.0
1515
k8s.io/api v0.33.3
1616
k8s.io/apimachinery v0.33.3
1717
)
1818

1919
require (
20-
cel.dev/expr v0.24.0 // indirect
20+
cel.dev/expr v0.25.1 // indirect
2121
cloud.google.com/go v0.121.6 // indirect
2222
cloud.google.com/go/auth v0.17.0 // indirect
2323
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
@@ -29,17 +29,17 @@ require (
2929
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
3030
github.com/beorn7/perks v1.0.1 // indirect
3131
github.com/cespare/xxhash/v2 v2.3.0 // indirect
32-
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
32+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
3333
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3434
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
35-
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
36-
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
35+
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
36+
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
3737
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3838
github.com/fatih/color v1.18.0 // indirect
3939
github.com/felixge/httpsnoop v1.0.4 // indirect
4040
github.com/fsnotify/fsnotify v1.7.0 // indirect
4141
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
42-
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
42+
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
4343
github.com/go-logr/logr v1.4.3 // indirect
4444
github.com/go-logr/stdr v1.2.2 // indirect
4545
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -82,27 +82,27 @@ require (
8282
github.com/stretchr/objx v0.5.2 // indirect
8383
github.com/x448/float16 v0.8.4 // indirect
8484
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
85-
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
85+
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
8686
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
8787
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
88-
go.opentelemetry.io/otel v1.40.0 // indirect
89-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
90-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
91-
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
92-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
88+
go.opentelemetry.io/otel v1.43.0 // indirect
89+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
90+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
91+
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
92+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
9393
go.yaml.in/yaml/v2 v2.4.3 // indirect
94-
golang.org/x/crypto v0.45.0 // indirect
95-
golang.org/x/net v0.47.0 // indirect
96-
golang.org/x/sync v0.18.0 // indirect
97-
golang.org/x/sys v0.40.0 // indirect
98-
golang.org/x/term v0.37.0 // indirect
99-
golang.org/x/text v0.31.0 // indirect
94+
golang.org/x/crypto v0.46.0 // indirect
95+
golang.org/x/net v0.48.0 // indirect
96+
golang.org/x/sync v0.19.0 // indirect
97+
golang.org/x/sys v0.42.0 // indirect
98+
golang.org/x/term v0.38.0 // indirect
99+
golang.org/x/text v0.32.0 // indirect
100100
golang.org/x/time v0.14.0 // indirect
101101
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
102102
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
103-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
104-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
105-
google.golang.org/grpc v1.77.0 // indirect
103+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
105+
google.golang.org/grpc v1.79.3 // indirect
106106
google.golang.org/protobuf v1.36.10 // indirect
107107
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
108108
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)