Upgrade Vitess Dependency and default Vitess image (#306)

GuptaManan100 · web-flow · commit c1322c342ab9 · 2022-09-01T22:26:14.000+05:30
* feat: update golang version in tests and images

Signed-off-by: Manan Gupta &lt;manan@planetscale.com&gt;

* feat: update vitess dependency

Signed-off-by: Manan Gupta &lt;manan@planetscale.com&gt;

* feat: update vitess/lite image

Signed-off-by: Manan Gupta &lt;manan@planetscale.com&gt;

Signed-off-by: Manan Gupta &lt;manan@planetscale.com&gt;
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -7,10 +7,10 @@ steps:
   - name: "Upgrade Test"
     command:
     - apk add g++ make bash curl mysql mysql-client
-    - wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.18.5.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.18.4.linux-amd64.tar.gz
+    - rm go1.18.5.linux-amd64.tar.gz
     - make upgrade-test
     concurrency: 1
     concurrency_group: 'vtop/upgrade-downgrade-test'
@@ -25,10 +25,10 @@ steps:
   - name: "Backup Restore Test"
     command:
     - apk add g++ make bash curl mysql mysql-client
-    - wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.18.5.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.18.4.linux-amd64.tar.gz
+    - rm go1.18.5.linux-amd64.tar.gz
     - make backup-restore-test
     concurrency: 1
     concurrency_group: 'vtop/backup-restore-test'
@@ -43,10 +43,10 @@ steps:
   - name: "VTOrc and VTAdmin Test"
     command:
     - apk add g++ make bash curl mysql mysql-client chromium
-    - wget https://golang.org/dl/go1.18.4.linux-amd64.tar.gz
-    - tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
+    - wget https://golang.org/dl/go1.18.5.linux-amd64.tar.gz
+    - tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
     - export PATH=$PATH:/usr/local/go/bin
-    - rm go1.18.4.linux-amd64.tar.gz
+    - rm go1.18.5.linux-amd64.tar.gz
     - make vtorc-vtadmin-test
     concurrency: 1
     concurrency_group: 'vtop/vtorc-vtadmin-test'
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.4
+        go-version: 1.18.5
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/.github/workflows/make-generate-and-diff.yaml b/.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.18.4
+        go-version: 1.18.5
       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
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.4
+        go-version: 1.18.5
       id: go
 
     - name: Check out code into the Go module directory
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.18.4 AS build
+FROM golang:1.18.5 AS build
 
 ENV GO111MODULE=on
 WORKDIR /go/src/planetscale.dev/vitess-operator
diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	sigs.k8s.io/controller-runtime v0.9.7
 	sigs.k8s.io/controller-tools v0.6.2
 	sigs.k8s.io/kustomize v2.0.3+incompatible
-	vitess.io/vitess v0.14.1
+	vitess.io/vitess v0.14.2
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -1473,5 +1473,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-vitess.io/vitess v0.14.1 h1:/dxeH41mpi01xt5dg327BDLvBz/XXH3CbKQWRinKw0o=
-vitess.io/vitess v0.14.1/go.mod h1:kOA0C53JqlYY68HoXfpgFqa8WFOn69KVM9bvhWIXuLo=
+vitess.io/vitess v0.14.2 h1:2VPtSer1J/mpj/lEZLG5b2OnZy76dROjI1G2Yz9ZFWg=
+vitess.io/vitess v0.14.2/go.mod h1:kOA0C53JqlYY68HoXfpgFqa8WFOn69KVM9bvhWIXuLo=
diff --git a/pkg/apis/planetscale/v2/defaults.go b/pkg/apis/planetscale/v2/defaults.go
@@ -105,7 +105,7 @@ const (
 	// DefaultMysqlPortName is the name for the MySQL port.
 	DefaultMysqlPortName = "mysql"
 
-	defaultVitessLiteImage = "vitess/lite:v14.0.1"
+	defaultVitessLiteImage = "vitess/lite:v14.0.2"
 )
 
 // DefaultImages are a set of images to use when the CRD doesn't specify.

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ require (`
`20`	`20`	`sigs.k8s.io/controller-runtime v0.9.7`
`21`	`21`	`sigs.k8s.io/controller-tools v0.6.2`
`22`	`22`	`sigs.k8s.io/kustomize v2.0.3+incompatible`
`23`		`- vitess.io/vitess v0.14.1`
	`23`	`+ vitess.io/vitess v0.14.2`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ const (`
`105`	`105`	`// DefaultMysqlPortName is the name for the MySQL port.`
`106`	`106`	`DefaultMysqlPortName = "mysql"`
`107`	`107`
`108`		`- defaultVitessLiteImage = "vitess/lite:v14.0.1"`
	`108`	`+ defaultVitessLiteImage = "vitess/lite:v14.0.2"`
`109`	`109`	`)`
`110`	`110`
`111`	`111`	`// DefaultImages are a set of images to use when the CRD doesn't specify.`