Skip to content

Commit ee22e39

Browse files
authored
Merge pull request #234 from blackpiglet/bump_golang_to_1.24
Bump Golang version to v1.24.
2 parents a9bc7bb + 0f491aa commit ee22e39

File tree

6 files changed

+161
-170
lines changed

6 files changed

+161
-170
lines changed

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.23-bookworm AS build
15+
FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS build
1616

1717
ARG TARGETOS
1818
ARG TARGETARCH

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ Below is a listing of plugin versions and respective Velero versions that are co
2626

2727
| Plugin Version | Velero Version |
2828
|-----------------|----------------|
29+
| v1.13.x | v1.17.x |
2930
| v1.12.x | v1.16.x |
3031
| v1.11.x | v1.15.x |
3132
| v1.10.x | v1.14.x |
3233
| v1.9.x | v1.13.x |
33-
| v1.8.x | v1.12.x |
3434

3535
## Filing issues
3636

@@ -228,7 +228,7 @@ Install Velero, including all prerequisites, into the cluster and start the depl
228228
```bash
229229
velero install \
230230
--provider gcp \
231-
--plugins velero/velero-plugin-for-gcp:v1.12.0 \
231+
--plugins velero/velero-plugin-for-gcp:v1.13.0 \
232232
--bucket $BUCKET \
233233
--secret-file ./credentials-velero
234234
```
@@ -240,7 +240,7 @@ You must add a service account annotation to the Kubernetes service account so t
240240
```bash
241241
velero install \
242242
--provider gcp \
243-
--plugins velero/velero-plugin-for-gcp:v1.12.0 \
243+
--plugins velero/velero-plugin-for-gcp:v1.13.0 \
244244
--bucket $BUCKET \
245245
--no-secret \
246246
--sa-annotations iam.gke.io/gcp-service-account=[$GSA_NAME]@[$PROJECT_ID].iam.gserviceaccount.com \

changelogs/CHANGELOG-1.13.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## All changes
2+
3+
* Add support for non-default google cloud universe domain. (#228, @7sinStone)
4+
* Remove image pushing to GCR. (#232, @blackpiglet)

changelogs/unreleased/228-7sinStone.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

go.mod

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

3-
go 1.23.0
4-
5-
toolchain go1.23.6
3+
go 1.24.0
64

75
require (
8-
cloud.google.com/go/storage v1.50.0
6+
cloud.google.com/go/storage v1.55.0
97
github.com/gofrs/uuid v4.2.0+incompatible
108
github.com/pkg/errors v0.9.1
119
github.com/sirupsen/logrus v1.9.3
1210
github.com/spf13/pflag v1.0.5
1311
github.com/stretchr/testify v1.10.0
14-
github.com/vmware-tanzu/velero v0.0.0-20250326090803-751d7822933a
15-
golang.org/x/oauth2 v0.27.0
16-
google.golang.org/api v0.218.0
12+
github.com/vmware-tanzu/velero v0.0.0-20250826085519-79b027577e6a
13+
golang.org/x/oauth2 v0.30.0
14+
google.golang.org/api v0.241.0
1715
k8s.io/api v0.31.3
1816
k8s.io/apimachinery v0.31.3
1917
)
2018

2119
require (
22-
cel.dev/expr v0.19.0 // indirect
23-
cloud.google.com/go v0.116.0 // indirect
24-
cloud.google.com/go/auth v0.14.0 // indirect
25-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
26-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
27-
cloud.google.com/go/iam v1.2.2 // indirect
28-
cloud.google.com/go/monitoring v1.21.2 // indirect
29-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
30-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
31-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
20+
cel.dev/expr v0.23.0 // indirect
21+
cloud.google.com/go v0.121.1 // indirect
22+
cloud.google.com/go/auth v0.16.2 // indirect
23+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
24+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
25+
cloud.google.com/go/iam v1.5.2 // indirect
26+
cloud.google.com/go/monitoring v1.24.2 // indirect
27+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
28+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
29+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
3230
github.com/beorn7/perks v1.0.1 // indirect
3331
github.com/cespare/xxhash/v2 v2.3.0 // indirect
34-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
32+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
3533
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3634
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3735
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
@@ -40,7 +38,8 @@ require (
4038
github.com/fatih/color v1.18.0 // indirect
4139
github.com/felixge/httpsnoop v1.0.4 // indirect
4240
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
43-
github.com/go-logr/logr v1.4.2 // indirect
41+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
42+
github.com/go-logr/logr v1.4.3 // indirect
4443
github.com/go-logr/stdr v1.2.2 // indirect
4544
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4645
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -50,21 +49,20 @@ require (
5049
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5150
github.com/golang/protobuf v1.5.4 // indirect
5251
github.com/google/gnostic-models v0.6.8 // indirect
53-
github.com/google/go-cmp v0.6.0 // indirect
52+
github.com/google/go-cmp v0.7.0 // indirect
5453
github.com/google/gofuzz v1.2.0 // indirect
5554
github.com/google/s2a-go v0.1.9 // indirect
5655
github.com/google/uuid v1.6.0 // indirect
57-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
58-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
56+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
57+
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
5958
github.com/hashicorp/go-hclog v0.14.1 // indirect
6059
github.com/hashicorp/go-plugin v1.6.0 // indirect
6160
github.com/hashicorp/yamux v0.1.1 // indirect
6261
github.com/imdario/mergo v0.3.13 // indirect
6362
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6463
github.com/josharian/intern v1.0.0 // indirect
6564
github.com/json-iterator/go v1.1.12 // indirect
66-
github.com/klauspost/compress v1.17.11 // indirect
67-
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0 // indirect
65+
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 // indirect
6866
github.com/mailru/easyjson v0.7.7 // indirect
6967
github.com/mattn/go-colorable v0.1.14 // indirect
7068
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -75,38 +73,39 @@ require (
7573
github.com/oklog/run v1.0.0 // indirect
7674
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
7775
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
78-
github.com/prometheus/client_golang v1.20.5 // indirect
79-
github.com/prometheus/client_model v0.6.1 // indirect
80-
github.com/prometheus/common v0.62.0 // indirect
76+
github.com/prometheus/client_golang v1.22.0 // indirect
77+
github.com/prometheus/client_model v0.6.2 // indirect
78+
github.com/prometheus/common v0.65.0 // indirect
8179
github.com/prometheus/procfs v0.15.1 // indirect
8280
github.com/spf13/afero v1.10.0 // indirect
8381
github.com/spf13/cobra v1.8.1 // indirect
82+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
8483
github.com/stretchr/objx v0.5.2 // indirect
8584
github.com/x448/float16 v0.8.4 // indirect
86-
go.opencensus.io v0.24.0 // indirect
85+
github.com/zeebo/errs v1.4.0 // indirect
8786
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
88-
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
89-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
91-
go.opentelemetry.io/otel v1.34.0 // indirect
92-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
93-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
94-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
95-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
96-
golang.org/x/crypto v0.36.0 // indirect
87+
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
88+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
90+
go.opentelemetry.io/otel v1.37.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
92+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
93+
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
94+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
95+
golang.org/x/crypto v0.40.0 // indirect
9796
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
98-
golang.org/x/net v0.38.0 // indirect
99-
golang.org/x/sync v0.12.0 // indirect
100-
golang.org/x/sys v0.31.0 // indirect
101-
golang.org/x/term v0.30.0 // indirect
102-
golang.org/x/text v0.23.0 // indirect
103-
golang.org/x/time v0.9.0 // indirect
97+
golang.org/x/net v0.42.0 // indirect
98+
golang.org/x/sync v0.16.0 // indirect
99+
golang.org/x/sys v0.34.0 // indirect
100+
golang.org/x/term v0.33.0 // indirect
101+
golang.org/x/text v0.27.0 // indirect
102+
golang.org/x/time v0.12.0 // indirect
104103
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
105-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
106-
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
107-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
108-
google.golang.org/grpc v1.70.0 // indirect
109-
google.golang.org/protobuf v1.36.4 // indirect
104+
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
105+
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
106+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
107+
google.golang.org/grpc v1.73.0 // indirect
108+
google.golang.org/protobuf v1.36.6 // indirect
110109
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
111110
gopkg.in/inf.v0 v0.9.1 // indirect
112111
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)