Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Go dependency, compatibility table, Vitess dependency and fix upgrades #371

Merged
merged 16 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
- wget https://golang.org/dl/go1.19.4.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.19.4.linux-amd64.tar.gz
- export PATH=$PATH:/usr/local/go/bin
- rm go1.18.5.linux-amd64.tar.gz
- rm go1.19.4.linux-amd64.tar.gz
- make upgrade-test
concurrency: 1
concurrency_group: 'vtop/upgrade-downgrade-test'
Expand All @@ -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.5.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
- wget https://golang.org/dl/go1.19.4.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.19.4.linux-amd64.tar.gz
- export PATH=$PATH:/usr/local/go/bin
- rm go1.18.5.linux-amd64.tar.gz
- rm go1.19.4.linux-amd64.tar.gz
- make backup-restore-test
concurrency: 1
concurrency_group: 'vtop/backup-restore-test'
Expand All @@ -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.5.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.18.5.linux-amd64.tar.gz
- wget https://golang.org/dl/go1.19.4.linux-amd64.tar.gz
- tar -C /usr/local -xzf go1.19.4.linux-amd64.tar.gz
- export PATH=$PATH:/usr/local/go/bin
- rm go1.18.5.linux-amd64.tar.gz
- rm go1.19.4.linux-amd64.tar.gz
- make vtorc-vtadmin-test
concurrency: 1
concurrency_group: 'vtop/vtorc-vtadmin-test'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.5
go-version: 1.19.4
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-generate-and-diff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.5
go-version: 1.19.4
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.5
go-version: 1.19.4
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-vitess-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.5
go-version: 1.19.4

- name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ integration-test:
PATH="$(PWD)/tools/_bin:$(PATH)" go test -v -timeout 5m ./test/integration/... -args --logtostderr -v=6

generate:
go run sigs.k8s.io/controller-tools/cmd/controller-gen object crd:trivialVersions=true,maxDescLen=0 paths="./pkg/apis/planetscale/v2" output:crd:artifacts:config=./deploy/crds
go run sigs.k8s.io/controller-tools/cmd/controller-gen object crd:maxDescLen=0 paths="./pkg/apis/planetscale/v2" output:crd:artifacts:config=./deploy/crds
go run github.com/ahmetb/gen-crd-api-reference-docs -api-dir planetscale.dev/vitess-operator/pkg/apis/planetscale/v2 -config ./docs/api/config.json -template-dir ./docs/api/template -out-file ./docs/api/index.html

generate-and-diff: generate
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Vitess Operator Version | Recommended Vitess Versions | Recommended Kubernetes V
`v2.6.*` | `v12.0.*`, or `v13.0.*` | `v1.20.*`, `v1.21.*`, or `v1.22.*`
`v2.7.*` | `v14.0.*` | `v1.20.*`, `v1.21.*`, or `v1.22.*`
`v2.8.*` | `v15.0.*` | `v1.22.*`, `v1.23.*`, or `v1.24.*`
`v2.9.*` | `v16.0.*` | `v1.22.*`, `v1.23.*`, or `v1.24.*`
`latest` | `latest` | `v1.22.*`, `v1.23.*`, or `v1.24.*`

If for some reason you must attempt to use versions outside the recommend
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# without messing up file permissions, since the Docker container doesn't run as
# your actual user.

FROM golang:1.18.5 AS build
FROM golang:1.19.4 AS build

ENV GO111MODULE=on
WORKDIR /go/src/planetscale.dev/vitess-operator
Expand Down
42 changes: 34 additions & 8 deletions deploy/crds/planetscale.com_etcdlockservers.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: etcdlockservers.planetscale.com
spec:
Expand Down Expand Up @@ -75,6 +74,7 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
dataSourceRef:
properties:
apiGroup:
Expand All @@ -83,12 +83,26 @@ spec:
type: string
name:
type: string
namespace:
type: string
required:
- kind
- name
type: object
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -129,6 +143,7 @@ spec:
type: string
type: object
type: object
x-kubernetes-map-type: atomic
storageClassName:
type: string
volumeMode:
Expand Down Expand Up @@ -156,6 +171,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
properties:
apiVersion:
Expand All @@ -165,6 +181,7 @@ spec:
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
properties:
containerName:
Expand All @@ -180,6 +197,7 @@ spec:
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
properties:
key:
Expand All @@ -191,6 +209,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
Expand Down Expand Up @@ -236,6 +255,7 @@ spec:
name:
type: string
type: object
x-kubernetes-map-type: atomic
type: array
initContainers:
x-kubernetes-preserve-unknown-fields: true
Expand All @@ -255,6 +275,18 @@ spec:
type: object
resources:
properties:
claims:
items:
properties:
name:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -294,9 +326,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions deploy/crds/planetscale.com_vitessbackups.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: vitessbackups.planetscale.com
spec:
Expand Down Expand Up @@ -52,9 +51,3 @@ spec:
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
9 changes: 1 addition & 8 deletions deploy/crds/planetscale.com_vitessbackupstorages.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: vitessbackupstorages.planetscale.com
spec:
Expand Down Expand Up @@ -165,9 +164,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading