Merge pull request #547 from planetscale/create-pull-request/patch

Upgrade to `go1.22.2` and upgrade Vitess Dependency to Latest

.buildkite/pipeline.yml

@@ -7,10 +7,10 @@ steps:
  - name: "Upgrade Test"
  command:
  - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
- - wget https://golang.org/dl/go1.22.1.linux-amd64.tar.gz
- - tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz
+ - wget https://golang.org/dl/go1.22.2.linux-amd64.tar.gz
+ - tar -C /usr/local -xzf go1.22.2.linux-amd64.tar.gz
  - export PATH=$PATH:/usr/local/go/bin
- - rm go1.22.1.linux-amd64.tar.gz
+ - rm go1.22.2.linux-amd64.tar.gz
  - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
  - make upgrade-test
  concurrency: 1
@@ -26,10 +26,10 @@ steps:
  - name: "Backup Restore Test"
  command:
  - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat
- - wget https://golang.org/dl/go1.22.1.linux-amd64.tar.gz
- - tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz
+ - wget https://golang.org/dl/go1.22.2.linux-amd64.tar.gz
+ - tar -C /usr/local -xzf go1.22.2.linux-amd64.tar.gz
  - export PATH=$PATH:/usr/local/go/bin
- - rm go1.22.1.linux-amd64.tar.gz
+ - rm go1.22.2.linux-amd64.tar.gz
  - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
  - make backup-restore-test
  concurrency: 1
@@ -45,10 +45,10 @@ steps:
  - name: "VTOrc and VTAdmin Test"
  command:
  - apk add g++ make bash gcompat curl mysql mysql-client libc6-compat chromium
- - wget https://golang.org/dl/go1.22.1.linux-amd64.tar.gz
- - tar -C /usr/local -xzf go1.22.1.linux-amd64.tar.gz
+ - wget https://golang.org/dl/go1.22.2.linux-amd64.tar.gz
+ - tar -C /usr/local -xzf go1.22.2.linux-amd64.tar.gz
  - export PATH=$PATH:/usr/local/go/bin
- - rm go1.22.1.linux-amd64.tar.gz
+ - rm go1.22.2.linux-amd64.tar.gz
  - ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2
  - make vtorc-vtadmin-test
  concurrency: 1

.github/workflows/integration-test.yaml

@@ -17,7 +17,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.22.1
+ go-version: 1.22.2
  id: go
 
  - name: Check out code into the Go module directory

.github/workflows/make-generate-and-diff.yaml

@@ -17,7 +17,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.22.1
+ go-version: 1.22.2
  id: go
 
  - name: Check out code into the Go module directory

.github/workflows/unit-test.yaml

@@ -17,7 +17,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.22.1
+ go-version: 1.22.2
  id: go
 
  - name: Check out code into the Go module directory

.github/workflows/upgrade-vitess-dependency.yaml

@@ -20,7 +20,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.22.1
+ go-version: 1.22.2
 
  - name: Check out code into the Go module directory
  uses: actions/checkout@v2

build/Dockerfile.release

@@ -11,7 +11,7 @@
 # without messing up file permissions, since the Docker container doesn't run as
 # your actual user.
 
-FROM golang:1.22.1 AS build
+FROM golang:1.22.2 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator

go.mod

@@ -1,6 +1,6 @@
 module planetscale.dev/vitess-operator
 
-go 1.22.1
+go 1.22.2
 
 require (
  github.com/ahmetb/gen-crd-api-reference-docs v0.1.5-0.20190629210212-52e137b8d003
@@ -21,39 +21,40 @@ require (
  sigs.k8s.io/controller-runtime v0.16.3
  sigs.k8s.io/controller-tools v0.11.3
  sigs.k8s.io/kustomize v2.0.3+incompatible
- vitess.io/vitess v0.10.3-0.20240329205959-e5eb9816e1b0
+ vitess.io/vitess v0.10.3-0.20240427144732-1e143c30e01b
 )
 
 require (
- cloud.google.com/go v0.112.1 // indirect
- cloud.google.com/go/compute v1.25.1 // indirect
- cloud.google.com/go/compute/metadata v0.2.3 // indirect
+ cloud.google.com/go v0.112.2 // indirect
+ cloud.google.com/go/auth v0.2.2 // indirect
+ cloud.google.com/go/auth/oauth2adapt v0.2.1 // indirect
+ cloud.google.com/go/compute/metadata v0.3.0 // indirect
  cloud.google.com/go/iam v1.1.7 // indirect
- cloud.google.com/go/storage v1.39.1 // indirect
+ cloud.google.com/go/storage v1.40.0 // indirect
  github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
  github.com/Azure/azure-pipeline-go v0.2.3 // indirect
  github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
  github.com/DataDog/appsec-internal-go v1.5.0 // indirect
- github.com/DataDog/datadog-agent/pkg/obfuscate v0.52.0 // indirect
- github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.52.0 // indirect
+ github.com/DataDog/datadog-agent/pkg/obfuscate v0.52.1 // indirect
+ github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.52.1 // indirect
  github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
  github.com/DataDog/go-libddwaf/v2 v2.4.2 // indirect
  github.com/DataDog/go-sqllexer v0.0.11 // indirect
  github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
  github.com/DataDog/sketches-go v1.4.4 // indirect
- github.com/Microsoft/go-winio v0.6.1 // indirect
+ github.com/Microsoft/go-winio v0.6.2 // indirect
  github.com/aquarapid/vaultlib v0.5.1 // indirect
  github.com/armon/go-metrics v0.4.1 // indirect
- github.com/aws/aws-sdk-go v1.51.8 // indirect
+ github.com/aws/aws-sdk-go v1.51.25 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver/v4 v4.0.0 // indirect
- github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/cespare/xxhash/v2 v2.3.0 // indirect
  github.com/coreos/go-semver v0.3.1 // indirect
  github.com/coreos/go-systemd/v22 v22.5.0 // indirect
  github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
  github.com/docker/distribution v2.8.2+incompatible // indirect
  github.com/dustin/go-humanize v1.0.1 // indirect
- github.com/ebitengine/purego v0.6.1 // indirect
+ github.com/ebitengine/purego v0.7.1 // indirect
  github.com/emicklei/go-restful/v3 v3.11.0 // indirect
  github.com/evanphx/json-patch v5.9.0+incompatible // indirect
  github.com/evanphx/json-patch/v5 v5.6.0 // indirect
@@ -70,7 +71,7 @@ require (
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/gobuffalo/flect v0.3.0 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/glog v1.2.0 // indirect
+ github.com/golang/glog v1.2.1 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
  github.com/golang/protobuf v1.5.4 // indirect
  github.com/golang/snappy v0.0.4 // indirect
@@ -87,7 +88,7 @@ require (
  github.com/hashicorp/consul/api v1.28.2 // indirect
  github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
- github.com/hashicorp/go-hclog v1.6.2 // indirect
+ github.com/hashicorp/go-hclog v1.6.3 // indirect
  github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
  github.com/hashicorp/go-multierror v1.1.1 // indirect
  github.com/hashicorp/go-rootcerts v1.0.2 // indirect
@@ -99,7 +100,7 @@ require (
  github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/klauspost/compress v1.17.7 // indirect
+ github.com/klauspost/compress v1.17.8 // indirect
  github.com/klauspost/pgzip v1.2.6 // indirect
  github.com/magiconair/properties v1.8.7 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
@@ -119,16 +120,16 @@ require (
  github.com/opentracing/opentracing-go v1.2.0 // indirect
  github.com/outcaste-io/ristretto v0.2.3 // indirect
  github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
- github.com/pelletier/go-toml/v2 v2.2.0 // indirect
+ github.com/pelletier/go-toml/v2 v2.2.1 // indirect
  github.com/philhofer/fwd v1.1.2 // indirect
  github.com/pierrec/lz4 v2.6.1+incompatible // indirect
  github.com/pires/go-proxyproto v0.7.0 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/planetscale/pargzip v0.0.0-20201116224723-90c7fc03ea8a // indirect
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
- github.com/prometheus/client_model v0.6.0 // indirect
- github.com/prometheus/common v0.51.1 // indirect
- github.com/prometheus/procfs v0.13.0 // indirect
+ github.com/prometheus/client_model v0.6.1 // indirect
+ github.com/prometheus/common v0.53.0 // indirect
+ github.com/prometheus/procfs v0.14.0 // indirect
  github.com/rivo/uniseg v0.4.7 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -146,37 +147,36 @@ require (
  github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
  github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
  github.com/z-division/go-zookeeper v1.0.0 // indirect
- go.etcd.io/etcd/api/v3 v3.5.12 // indirect
- go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
- go.etcd.io/etcd/client/v3 v3.5.12 // indirect
+ go.etcd.io/etcd/api/v3 v3.5.13 // indirect
+ go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
+ go.etcd.io/etcd/client/v3 v3.5.13 // indirect
  go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
- go.opentelemetry.io/otel v1.24.0 // indirect
- go.opentelemetry.io/otel/metric v1.24.0 // indirect
- go.opentelemetry.io/otel/trace v1.24.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect
+ go.opentelemetry.io/otel v1.25.0 // indirect
+ go.opentelemetry.io/otel/metric v1.25.0 // indirect
+ go.opentelemetry.io/otel/trace v1.25.0 // indirect
  go.uber.org/atomic v1.11.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.27.0 // indirect
- golang.org/x/crypto v0.21.0 // indirect
- golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
- golang.org/x/mod v0.16.0 // indirect
- golang.org/x/net v0.22.0 // indirect
- golang.org/x/oauth2 v0.18.0 // indirect
- golang.org/x/sync v0.6.0 // indirect
- golang.org/x/sys v0.18.0 // indirect
- golang.org/x/term v0.18.0 // indirect
+ golang.org/x/crypto v0.22.0 // indirect
+ golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
+ golang.org/x/mod v0.17.0 // indirect
+ golang.org/x/net v0.24.0 // indirect
+ golang.org/x/oauth2 v0.19.0 // indirect
+ golang.org/x/sync v0.7.0 // indirect
+ golang.org/x/sys v0.19.0 // indirect
+ golang.org/x/term v0.19.0 // indirect
  golang.org/x/text v0.14.0 // indirect
  golang.org/x/time v0.5.0 // indirect
- golang.org/x/tools v0.19.0 // indirect
+ golang.org/x/tools v0.20.0 // indirect
  golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
  gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
- google.golang.org/api v0.171.0 // indirect
- google.golang.org/appengine v1.6.8 // indirect
- google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect
- google.golang.org/grpc v1.62.1 // indirect
+ google.golang.org/api v0.176.0 // indirect
+ google.golang.org/genproto v0.0.0-20240415180920-8c6c420018be // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
+ google.golang.org/grpc v1.63.2 // indirect
  google.golang.org/protobuf v1.33.0 // indirect
  gopkg.in/DataDog/dd-trace-go.v1 v1.62.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect