Prepare for v2.3.0 release. (#172)

* Prepare for v2.3.0 release. Signed-off-by: Anthony Yeh <[email protected]> * Update to Go 1.15. To match Vitess. Signed-off-by: Anthony Yeh <[email protected]>
planetscale · Jan 26, 2021 · 85d576c · 85d576c
1 parent 94d3d46
commit 85d576c
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 25 deletions.
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.15
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.13
+        go-version: 1.15
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Vitess Operator Version | Recommended Vitess Versions | Recommended Kubernetes V
 `v2.0.*` | `v6.0.*` | `v1.13.*`, `v1.14.*`, or `v1.15.*`
 `v2.1.*` | `v7.0.*` | `v1.15.*`, `v1.16.*`, or `v1.17.*`
 `v2.2.*` | `v8.0.*` | `v1.15.*`, `v1.16.*`, or `v1.17.*`
+`v2.3.*` | `v9.0.*` | `v1.15.*`, `v1.16.*`, or `v1.17.*`
 `latest` | `latest` | `v1.15.*`, `v1.16.*`, or `v1.17.*`
 
 If for some reason you must attempt to use versions outside the recommend

diff --git a/build/Dockerfile.release b/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.13 AS build
+FROM golang:1.15 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator

diff --git a/go.mod b/go.mod
@@ -1,9 +1,8 @@
 module planetscale.dev/vitess-operator
 
-go 1.13
+go 1.15
 
 require (
-	github.com/Azure/azure-storage-blob-go v0.10.0 // indirect
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5-0.20190629210212-52e137b8d003
 	github.com/klauspost/compress v1.7.5 // indirect
 	github.com/klauspost/cpuid v1.2.1 // indirect
@@ -12,7 +11,7 @@ require (
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
-	gopkg.in/yaml.v2 v2.2.8
+	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.17.3
 	k8s.io/client-go v12.0.0+incompatible
@@ -23,7 +22,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.4.0
 	sigs.k8s.io/controller-tools v0.2.4
 	sigs.k8s.io/yaml v1.1.0
-	vitess.io/vitess v0.0.0-20201027135623-7e09d0c20ca1
+	vitess.io/vitess v0.0.0-20210125161451-daa60859822f
 )
 
 // ****************************

diff --git a/go.sum b/go.sum
diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go
@@ -97,7 +97,7 @@ const (
 	// DefaultMysqlPortName is the name for the MySQL port.
 	DefaultMysqlPortName = "mysql"
 
-	defaultVitessLiteImage = "vitess/lite:v8.0.0"
+	defaultVitessLiteImage = "vitess/lite:v9.0.0"
 )
 
 // DefaultImages are a set of images to use when the CRD doesn't specify.

diff --git a/pkg/controller/vitesskeyspace/reconcile_resharding.go b/pkg/controller/vitesskeyspace/reconcile_resharding.go
@@ -42,7 +42,7 @@ func (r *reconcileHandler) reconcileResharding(ctx context.Context) (reconcile.R
 		return resultBuilder.RequeueAfter(topoRequeueDelay)
 	}
 
-	workflowList, err := r.wr.ListAllWorkflows(ctx, r.vtk.Spec.Name)
+	workflowList, err := r.wr.ListAllWorkflows(ctx, r.vtk.Spec.Name, true /* only list active workflows */)
 	if err != nil {
 		// The only reason this would fail is if runVExec fails. This could be a topo communication failure or any number
 		// of indeterminable failures. We probably want to requeu faster than the resync period to try again, but wait a bit in