From c6fd0704e31dd72b5f38342360afd2d04c589779 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 12:59:46 -0400 Subject: [PATCH 1/2] Disable CGO usage in builds Signed-off-by: Matt Lord --- build/Dockerfile.release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile.release b/build/Dockerfile.release index f81e8554..77187f1d 100644 --- a/build/Dockerfile.release +++ b/build/Dockerfile.release @@ -16,7 +16,7 @@ FROM golang:1.20.2 AS build ENV GO111MODULE=on WORKDIR /go/src/planetscale.dev/vitess-operator COPY . /go/src/planetscale.dev/vitess-operator -RUN go install /go/src/planetscale.dev/vitess-operator/cmd/manager +RUN CGO_ENABLED=0 go install /go/src/planetscale.dev/vitess-operator/cmd/manager # The rest is meant to mimic the output from operator-sdk's Dockerfile. # We just copy the binary we built inside Docker instead of from outside. From 94b6946ef4a9396df3874d397367adf6f7d8d4ed Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 9 Oct 2023 14:19:30 -0400 Subject: [PATCH 2/2] Stop using mysql57 image for backup test Signed-off-by: Matt Lord --- .../operator/101_initial_cluster_backup.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/endtoend/operator/101_initial_cluster_backup.yaml b/test/endtoend/operator/101_initial_cluster_backup.yaml index dc0b52a0..933872d1 100644 --- a/test/endtoend/operator/101_initial_cluster_backup.yaml +++ b/test/endtoend/operator/101_initial_cluster_backup.yaml @@ -15,13 +15,13 @@ spec: path: /backup type: Directory images: - vtctld: vitess/lite:v17.0.2-mysql57 - vtgate: vitess/lite:v17.0.2-mysql57 - vttablet: vitess/lite:v17.0.2-mysql57 - vtorc: vitess/lite:v17.0.2-mysql57 - vtbackup: vitess/lite:v17.0.2-mysql57 + vtctld: vitess/lite:v17.0.2 + vtgate: vitess/lite:v17.0.2 + vttablet: vitess/lite:v17.0.2 + vtorc: vitess/lite:v17.0.2 + vtbackup: vitess/lite:v17.0.2 mysqld: - mysql56Compatible: vitess/lite:v17.0.2-mysql57 + mysql56Compatible: vitess/lite:v17.0.2 mysqldExporter: prom/mysqld-exporter:v0.11.0 cells: - name: zone1 @@ -213,4 +213,4 @@ stringData: RESET MASTER; # We need to set super_read_only back to what it was before - SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON'); \ No newline at end of file + SET GLOBAL super_read_only=IFNULL(@original_super_read_only, 'ON');