Skip to content

Commit a328257

Browse files
runkechengrunkecheng
authored
*: update go version to 1.17 (#677)
feat(chore): update go version to 1.17 go 1.16 -> 1.17.13 controller-util: v0.3.0 -> v0.4.3 corev1.Handler -> corev1.ProbeHandler, corev1.LifecycleHandler BREAKING POINTS: CI fix: #674
1 parent 35cbadc commit a328257

38 files changed

+477
-222
lines changed

‎.github/workflows/code_check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Go
2828
uses: actions/setup-go@v2
2929
with:
30-
go-version: 1.16
30+
go-version: 1.17.13
3131

3232
- name: Check out source code
3333
uses: actions/checkout@v1
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up Go
4747
uses: actions/setup-go@v2
4848
with:
49-
go-version: 1.16
49+
go-version: 1.17.13
5050

5151
- name: Check out source code
5252
uses: actions/checkout@v1
@@ -65,7 +65,7 @@ jobs:
6565
- name: Set up Go
6666
uses: actions/setup-go@v2
6767
with:
68-
go-version: 1.16
68+
go-version: 1.17.13
6969

7070
- name: Check out source code
7171
uses: actions/checkout@v1
@@ -82,7 +82,7 @@ jobs:
8282
- name: Set up Go
8383
uses: actions/setup-go@v2
8484
with:
85-
go-version: 1.16
85+
go-version: 1.17.13
8686

8787
- name: Check out source code
8888
uses: actions/checkout@v1

‎.github/workflows/unit_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: 1.16
23+
go-version: 1.17.13
2424

2525
- name: Check out source code
2626
uses: actions/checkout@v1
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go
3535
uses: actions/setup-go@v2
3636
with:
37-
go-version: 1.16
37+
go-version: 1.17.13
3838

3939
- name: Check out source code
4040
uses: actions/checkout@v1

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.16 as builder
2+
FROM golang:1.17.13 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎Dockerfile.sidecar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build Sidecar
33
###############################################################################
44
# Build the manager binary
5-
FROM golang:1.16 as builder
5+
FROM golang:1.17.13 as builder
66

77
WORKDIR /workspace
88
# Copy the Go Modules manifests

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backup/syncer/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package syncer
1919
import (
2020
"fmt"
2121

22-
"github.com/presslabs/controller-util/syncer"
22+
"github.com/presslabs/controller-util/pkg/syncer"
2323
batchv1 "k8s.io/api/batch/v1"
2424
corev1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎build/mysql/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16 as builder
1+
FROM golang:1.17.13 as builder
22

33
WORKDIR /
44
# Copy the Go Modules manifests

‎build/xenon/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build Xenon
33
###############################################################################
44

5-
FROM golang:1.16 as builder
5+
FROM golang:1.17.13 as builder
66

77
ARG XENON_BRANCH=master
88
RUN if [ $(cat /etc/timezone) = "Asia/Shanghai" ] ; then go env -w GOPROXY=https://goproxy.cn,direct; fi && go env -w GO111MODULE=off;

‎charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ spec:
581581
field. null selector and null or empty namespaces
582582
list means "this pod's namespace". An empty
583583
selector ({}) matches all namespaces. This
584-
field is alpha-level and is only honored when
584+
field is beta-level and is only honored when
585585
PodAffinityNamespaceSelector feature is enabled.
586586
properties:
587587
matchExpressions:
@@ -743,7 +743,7 @@ spec:
743743
field and the ones listed in the namespaces field.
744744
null selector and null or empty namespaces list
745745
means "this pod's namespace". An empty selector
746-
({}) matches all namespaces. This field is alpha-level
746+
({}) matches all namespaces. This field is beta-level
747747
and is only honored when PodAffinityNamespaceSelector
748748
feature is enabled.
749749
properties:
@@ -905,7 +905,7 @@ spec:
905905
field. null selector and null or empty namespaces
906906
list means "this pod's namespace". An empty
907907
selector ({}) matches all namespaces. This
908-
field is alpha-level and is only honored when
908+
field is beta-level and is only honored when
909909
PodAffinityNamespaceSelector feature is enabled.
910910
properties:
911911
matchExpressions:
@@ -1067,7 +1067,7 @@ spec:
10671067
field and the ones listed in the namespaces field.
10681068
null selector and null or empty namespaces list
10691069
means "this pod's namespace". An empty selector
1070-
({}) matches all namespaces. This field is alpha-level
1070+
({}) matches all namespaces. This field is beta-level
10711071
and is only honored when PodAffinityNamespaceSelector
10721072
feature is enabled.
10731073
properties:

‎config/crd/bases/mysql.radondb.com_mysqlclusters.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ spec:
581581
field. null selector and null or empty namespaces
582582
list means "this pod's namespace". An empty
583583
selector ({}) matches all namespaces. This
584-
field is alpha-level and is only honored when
584+
field is beta-level and is only honored when
585585
PodAffinityNamespaceSelector feature is enabled.
586586
properties:
587587
matchExpressions:
@@ -743,7 +743,7 @@ spec:
743743
field and the ones listed in the namespaces field.
744744
null selector and null or empty namespaces list
745745
means "this pod's namespace". An empty selector
746-
({}) matches all namespaces. This field is alpha-level
746+
({}) matches all namespaces. This field is beta-level
747747
and is only honored when PodAffinityNamespaceSelector
748748
feature is enabled.
749749
properties:
@@ -905,7 +905,7 @@ spec:
905905
field. null selector and null or empty namespaces
906906
list means "this pod's namespace". An empty
907907
selector ({}) matches all namespaces. This
908-
field is alpha-level and is only honored when
908+
field is beta-level and is only honored when
909909
PodAffinityNamespaceSelector feature is enabled.
910910
properties:
911911
matchExpressions:
@@ -1067,7 +1067,7 @@ spec:
10671067
field and the ones listed in the namespaces field.
10681068
null selector and null or empty namespaces list
10691069
means "this pod's namespace". An empty selector
1070-
({}) matches all namespaces. This field is alpha-level
1070+
({}) matches all namespaces. This field is beta-level
10711071
and is only honored when PodAffinityNamespaceSelector
10721072
feature is enabled.
10731073
properties:

‎controllers/backup_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sort"
2424
"strings"
2525

26-
"github.com/presslabs/controller-util/syncer"
26+
"github.com/presslabs/controller-util/pkg/syncer"
2727
batchv1 "k8s.io/api/batch/v1"
2828
corev1 "k8s.io/api/core/v1"
2929
"k8s.io/apimachinery/pkg/api/errors"

‎controllers/mysqlcluster_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"context"
2121
"reflect"
2222

23-
"github.com/presslabs/controller-util/meta"
24-
"github.com/presslabs/controller-util/syncer"
23+
"github.com/presslabs/controller-util/pkg/meta"
24+
"github.com/presslabs/controller-util/pkg/syncer"
2525
appsv1 "k8s.io/api/apps/v1"
2626
corev1 "k8s.io/api/core/v1"
2727
policyv1beta1 "k8s.io/api/policy/v1beta1"

‎controllers/mysqluser_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/go-test/deep"
26-
"github.com/presslabs/controller-util/meta"
26+
"github.com/presslabs/controller-util/pkg/meta"
2727
corev1 "k8s.io/api/core/v1"
2828
"k8s.io/apimachinery/pkg/api/errors"
2929
"k8s.io/apimachinery/pkg/runtime"

‎controllers/status_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"sync"
2323
"time"
2424

25-
"github.com/presslabs/controller-util/syncer"
25+
"github.com/presslabs/controller-util/pkg/syncer"
2626
"k8s.io/apimachinery/pkg/api/errors"
2727
"k8s.io/apimachinery/pkg/runtime"
2828
"k8s.io/apimachinery/pkg/types"

‎go.mod

Lines changed: 73 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,86 @@
11
module github.com/radondb/radondb-mysql-kubernetes
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/agiledragon/gomonkey/v2 v2.2.0
77
github.com/blang/semver v3.5.1+incompatible
88
github.com/go-ini/ini v1.62.0
9-
github.com/go-logr/logr v0.4.0
9+
github.com/go-logr/logr v1.2.2
1010
github.com/go-sql-driver/mysql v1.6.0
11-
github.com/go-test/deep v1.0.7
11+
github.com/go-test/deep v1.0.8
1212
github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
1313
github.com/imdario/mergo v0.3.12
14-
github.com/onsi/ginkgo/v2 v2.0.0
15-
github.com/onsi/gomega v1.17.0
16-
github.com/presslabs/controller-util v0.3.0
17-
github.com/sirupsen/logrus v1.7.0
18-
github.com/spf13/cobra v1.1.3
14+
github.com/onsi/ginkgo/v2 v2.1.3
15+
github.com/onsi/gomega v1.19.0
16+
github.com/presslabs/controller-util v0.4.3
17+
github.com/sirupsen/logrus v1.8.1
18+
github.com/spf13/cobra v1.2.1
1919
github.com/stretchr/testify v1.7.0
2020
github.com/wgliang/cron v0.0.0-20210929064749-bba7232645e5
21-
golang.org/x/tools v0.1.8-0.20211028023602-8de2a7fd1736 // indirect
22-
k8s.io/api v0.21.3
23-
k8s.io/apimachinery v0.21.3
24-
k8s.io/client-go v0.21.3
25-
k8s.io/klog/v2 v2.8.0
26-
sigs.k8s.io/controller-runtime v0.9.5
21+
k8s.io/api v0.23.5
22+
k8s.io/apimachinery v0.23.5
23+
k8s.io/client-go v0.23.5
24+
k8s.io/klog/v2 v2.30.0
25+
sigs.k8s.io/controller-runtime v0.11.2
26+
)
27+
28+
require (
29+
cloud.google.com/go v0.81.0 // indirect
30+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
31+
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
32+
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
33+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
34+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
35+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
36+
github.com/beorn7/perks v1.0.1 // indirect
37+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
38+
github.com/davecgh/go-spew v1.1.1 // indirect
39+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
40+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
41+
github.com/fsnotify/fsnotify v1.5.1 // indirect
42+
github.com/go-logr/zapr v1.2.3 // indirect
43+
github.com/gogo/protobuf v1.3.2 // indirect
44+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45+
github.com/golang/protobuf v1.5.2 // indirect
46+
github.com/google/go-cmp v0.5.5 // indirect
47+
github.com/google/gofuzz v1.1.0 // indirect
48+
github.com/google/uuid v1.1.2 // indirect
49+
github.com/googleapis/gnostic v0.5.5 // indirect
50+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
51+
github.com/json-iterator/go v1.1.12 // indirect
52+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
53+
github.com/moby/spdystream v0.2.0 // indirect
54+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
55+
github.com/modern-go/reflect2 v1.0.2 // indirect
56+
github.com/pkg/errors v0.9.1 // indirect
57+
github.com/pmezard/go-difflib v1.0.0 // indirect
58+
github.com/prometheus/client_golang v1.11.1 // indirect
59+
github.com/prometheus/client_model v0.2.0 // indirect
60+
github.com/prometheus/common v0.28.0 // indirect
61+
github.com/prometheus/procfs v0.6.0 // indirect
62+
github.com/spf13/pflag v1.0.5 // indirect
63+
go.uber.org/atomic v1.7.0 // indirect
64+
go.uber.org/multierr v1.6.0 // indirect
65+
go.uber.org/zap v1.21.0 // indirect
66+
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
67+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
68+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
69+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
70+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
71+
golang.org/x/text v0.3.7 // indirect
72+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
73+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
74+
google.golang.org/appengine v1.6.7 // indirect
75+
google.golang.org/protobuf v1.27.1 // indirect
76+
gopkg.in/inf.v0 v0.9.1 // indirect
77+
gopkg.in/yaml.v2 v2.4.0 // indirect
78+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
79+
k8s.io/apiextensions-apiserver v0.23.5 // indirect
80+
k8s.io/component-base v0.23.5 // indirect
81+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
82+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
83+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
84+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
85+
sigs.k8s.io/yaml v1.3.0 // indirect
2786
)

0 commit comments

Comments
 (0)