Skip to content

Commit 030c3f2

Browse files
authored
Merge pull request #777 from planetscale/go_1.26.2
Use go1.26.2 and bump go deps
2 parents 26a6b1d + ea1aa73 commit 030c3f2

10 files changed

Lines changed: 417 additions & 365 deletions

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ agents:
22
queue: "public"
33

44
env:
5-
GO_VERSION_FILE: "go1.26.1.linux-amd64.tar.gz"
5+
GO_VERSION_FILE: "go1.26.2.linux-amd64.tar.gz"
66

77
# Mount the docker.sock as to the docker container, so that we are able to
88
# run docker build command and kind is spawned as a sibling container.

build/Dockerfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# without messing up file permissions, since the Docker container doesn't run as
1212
# your actual user.
1313

14-
FROM golang:1.26.1 AS build
14+
FROM golang:1.26.2 AS build
1515

1616
ENV GO111MODULE=on
1717
WORKDIR /go/src/planetscale.dev/vitess-operator

go.mod

Lines changed: 116 additions & 101 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 292 additions & 255 deletions
Large diffs are not rendered by default.

test/endtoend/backup_restore_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ setupKindCluster
6262
cd test/endtoend/operator || exit 1
6363

6464
get_started "operator-latest.yaml" "101_initial_cluster_backup.yaml"
65-
verifyVtGateVersion "24.0.0"
65+
verifyVtGateVersion "25.0.0"
6666
checkSemiSyncSetup
6767
checkMysqldExporterMetrics
6868
takeBackup "commerce/-"

test/endtoend/backup_schedule_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ setupKindCluster
3232
cd test/endtoend/operator || exit 1
3333

3434
get_started "operator-latest.yaml" "101_initial_cluster_backup_schedule.yaml"
35-
verifyVtGateVersion "24.0.0"
35+
verifyVtGateVersion "25.0.0"
3636
checkSemiSyncSetup
3737
checkMysqldExporterMetrics
3838
verifyListBackupsOutputWithSchedule

test/endtoend/backup_schedule_vtctldclient_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setupKindCluster
116116
cd test/endtoend/operator || exit 1
117117

118118
get_started "operator-latest.yaml" "103_initial_cluster_vtctldclient_backup_schedule.yaml"
119-
verifyVtGateVersion "24.0.0"
119+
verifyVtGateVersion "25.0.0"
120120
verifyVtctldclientScheduleJobs
121121

122122
# Teardown

test/endtoend/hpa_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ./test/endtoend/utils.sh
55

66
function verifyHpaCount() {
77
expectedCount=$1
8-
count=$(kubectl get hpa -n example --no-headers | wc -l)
8+
count=$(kubectl get hpa -n example -o name | wc -l | tr -d ' ')
99
if [[ "$count" -eq "$expectedCount" ]]; then
1010
echo "HorizontalPodAutoscaler count is $count"
1111
return 0
@@ -34,7 +34,7 @@ setupKindCluster
3434
cd test/endtoend/operator || exit 1
3535

3636
get_started "operator-latest.yaml" "101_initial_cluster_autoscale.yaml"
37-
verifyVtGateVersion "24.0.0"
37+
verifyVtGateVersion "25.0.0"
3838
checkSemiSyncSetup
3939
checkMysqldExporterMetrics
4040

test/endtoend/upgrade_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ checkMysqldExporterMetrics
272272
# Initially too durability policy should be specified
273273
verifyDurabilityPolicy "commerce" "semi_sync"
274274
upgradeToLatest
275-
verifyVtGateVersion "24.0.0"
275+
verifyVtGateVersion "25.0.0"
276276
verifyResourceSpec
277277
checkSemiSyncSetup
278278
checkMysqldExporterMetrics

test/endtoend/vtorc_vtadmin_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ setupKindCluster
173173
cd test/endtoend/operator || exit 1
174174

175175
get_started_vtorc_vtadmin
176-
verifyVtGateVersion "24.0.0"
176+
verifyVtGateVersion "25.0.0"
177177
checkSemiSyncSetup
178178

179179
# Check Vtadmin is setup

0 commit comments

Comments
 (0)