Skip to content

Commit 41b6f3c

Browse files
acekingkeacekingke
authored
*: update version to 2.3.0 (#742)
1 parent 6dab2c5 commit 41b6f3c

19 files changed

+52
-36
lines changed

‎Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Image URL to use all building/pushing image targets
22
REGISTRY ?= quay.io
3+
FROM_VERSION ?=v2.2.1
4+
CHART_VERSION ?=2.2.1
5+
CHART_TOVERSION ?=2.3.0
6+
TO_VERSION ?=v2.3.0
37
IMGPREFIX ?=radondb/
48
IMG ?= $(IMGPREFIX)mysql-operator:latest
59
SIDECAR57_IMG ?= $(IMGPREFIX)mysql57-sidecar:latest
@@ -128,3 +132,15 @@ e2e-local:
128132
go test -v ./test/e2e $(G_ARGS) -timeout 20m
129133
todo:
130134
@grep -Irnw './' -e 'TODO:'|grep -v grep
135+
136+
updateVersion:
137+
find ./ -type f -name "*.go" -o -name "*.yaml" -exec sed -i "s/mysql57-sidecar:$(FROM_VERSION)/mysql57-sidecar:$(TO_VERSION)/g" {} \;
138+
find ./ -type f -name "*.go" -o -name "*.yaml" -exec sed -i "s/xenon:$(FROM_VERSION)/xenon:$(TO_VERSION)/g" {} \;
139+
find ./ -type f -name "*.go" -o -name "*.yaml" -exec sed -i "s/mysql-operator:$(FROM_VERSION)/mysql-operator:$(TO_VERSION)/g" {} \;
140+
find ./ -type f -name "*.go" -o -name "*.yaml" -exec sed -i "s/mysql80-sidecar:$(FROM_VERSION)/mysql80-sidecar:$(TO_VERSION)/g" {} \;
141+
find ./ -type f -name "*.go" -o -name "*.yaml" -exec sed -i "s/mysql-operator-$(FROM_VERSION)/mysql-operator-$(TO_VERSION)/g" {} \;
142+
find ./ -type f -name "*.go" -o -name "*.yaml" -exec sed -i "s/\"$(FROM_VERSION)\"/\"$(TO_VERSION)\"/g" {} \;
143+
# sed -i "18s/$(CHART_VERSION)/$(CHART_TOVERSION)/" charts/mysql-operator/charts/Chart.yaml
144+
find ./charts -type f -name "*.yaml" -exec sed -i "s/$(CHART_VERSION)/$(CHART_TOVERSION)/g" {} \;
145+
find ./config -type f -name "*.yaml" -exec sed -i "s/$(CHART_VERSION)/$(CHART_TOVERSION)/g" {} \;
146+

‎api/v1alpha1/backup_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type BackupSpec struct {
2929

3030
// To specify the image that will be used for sidecar container.
3131
// +optional
32-
// +kubebuilder:default:="radondb/mysql57-sidecar:v2.2.1"
32+
// +kubebuilder:default:="radondb/mysql57-sidecar:v2.3.0"
3333
Image string `json:"image"`
3434

3535
// HostName represents the host for which to take backup

‎api/v1alpha1/mysqlcluster_types.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type MysqlClusterSpec struct {
4848

4949
// XenonOpts is the options of xenon container.
5050
// +optional
51-
// +kubebuilder:default:={image: "radondb/xenon:v2.2.1", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}}
51+
// +kubebuilder:default:={image: "radondb/xenon:v2.3.0", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}}
5252
XenonOpts XenonOpts `json:"xenonOpts,omitempty"`
5353

5454
// MetricsOpts is the options of metrics container.
@@ -65,7 +65,7 @@ type MysqlClusterSpec struct {
6565

6666
// PodPolicy defines the policy to extra specification.
6767
// +optional
68-
// +kubebuilder:default:={imagePullPolicy: "IfNotPresent", extraResources: {requests: {cpu: "10m", memory: "32Mi"}}, sidecarImage: "radondb/mysql57-sidecar:v2.2.1", busyboxImage: "busybox:1.32"}
68+
// +kubebuilder:default:={imagePullPolicy: "IfNotPresent", extraResources: {requests: {cpu: "10m", memory: "32Mi"}}, sidecarImage: "radondb/mysql57-sidecar:v2.3.0", busyboxImage: "busybox:1.32"}
6969
PodPolicy PodPolicy `json:"podPolicy,omitempty"`
7070

7171
// PVC extra specifiaction.
@@ -181,7 +181,7 @@ type MysqlOpts struct {
181181
type XenonOpts struct {
182182
// To specify the image that will be used for xenon container.
183183
// +optional
184-
// +kubebuilder:default:="radondb/xenon:v2.2.1"
184+
// +kubebuilder:default:="radondb/xenon:v2.3.0"
185185
Image string `json:"image,omitempty"`
186186

187187
// High available component admit defeat heartbeat count.
@@ -248,7 +248,7 @@ type PodPolicy struct {
248248

249249
// To specify the image that will be used for sidecar container.
250250
// +optional
251-
// +kubebuilder:default:="radondb/mysql57-sidecar:v2.2.1"
251+
// +kubebuilder:default:="radondb/mysql57-sidecar:v2.3.0"
252252
SidecarImage string `json:"sidecarImage,omitempty"`
253253

254254
// The busybox image.

‎charts/mysql-operator/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: v2.2.1
18+
version: v2.3.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "v2.2.1"
24+
appVersion: "v2.3.0"
2525
dependencies:
2626
- name: "mysqlcluster"
27-
version: "v2.2.1"
27+
version: "v2.3.0"
2828

‎charts/mysql-operator/charts/mysql-cluster/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 2.2.1
18+
version: 2.3.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "v2.2.1"
24+
appVersion: "v2.3.0"

‎charts/mysql-operator/charts/mysql-cluster/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: "sample"
66
namespace: "default"
77

88
mysqlVersion: "8.0"
9-
version: v2.2.1
9+
version: v2.3.0
1010

1111
tls:
1212
enable: false

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
If is empty, is use leader HostName
6868
type: string
6969
image:
70-
default: radondb/mysql57-sidecar:v2.2.1
70+
default: radondb/mysql57-sidecar:v2.3.0
7171
description: To specify the image that will be used for sidecar container.
7272
type: string
7373
nfsServerAddress:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ spec:
302302
cpu: 10m
303303
memory: 32Mi
304304
imagePullPolicy: IfNotPresent
305-
sidecarImage: radondb/mysql57-sidecar:v2.2.1
305+
sidecarImage: radondb/mysql57-sidecar:v2.3.0
306306
description: PodPolicy defines the policy to extra specification.
307307
properties:
308308
affinity:
@@ -1232,7 +1232,7 @@ spec:
12321232
schedulerName:
12331233
type: string
12341234
sidecarImage:
1235-
default: radondb/mysql57-sidecar:v2.2.1
1235+
default: radondb/mysql57-sidecar:v2.3.0
12361236
description: To specify the image that will be used for sidecar
12371237
container.
12381238
type: string
@@ -1304,7 +1304,7 @@ spec:
13041304
default:
13051305
admitDefeatHearbeatCount: 5
13061306
electionTimeout: 10000
1307-
image: radondb/xenon:v2.2.1
1307+
image: radondb/xenon:v2.3.0
13081308
resources:
13091309
limits:
13101310
cpu: 100m
@@ -1331,7 +1331,7 @@ spec:
13311331
automatically rebuild the invalid node.
13321332
type: boolean
13331333
image:
1334-
default: radondb/xenon:v2.2.1
1334+
default: radondb/xenon:v2.3.0
13351335
description: To specify the image that will be used for xenon
13361336
container.
13371337
type: string

‎charts/mysql-operator/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ installCRDS: true
77

88
mysqlcluster:
99
install: false
10-
version: v2.2.1
10+
version: v2.3.0
1111
## Specify an imagePullPolicy (Required)
1212
## It's recommended to change this to 'Always' if the image tag is 'latest'
1313
## ref: http://kubernetes.io/docs/user-guide/images/#updating-images
@@ -25,7 +25,7 @@ tolerationSeconds: 30
2525

2626
manager:
2727
image: radondb/mysql-operator
28-
tag: v2.2.1
28+
tag: v2.3.0
2929
enableWebhooks: true
3030
resources: {}
3131
# We usually recommend not to specify default resources and to leave this as a conscious

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
If is empty, is use leader HostName
6868
type: string
6969
image:
70-
default: radondb/mysql57-sidecar:v2.2.1
70+
default: radondb/mysql57-sidecar:v2.3.0
7171
description: To specify the image that will be used for sidecar container.
7272
type: string
7373
nfsServerAddress:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ spec:
302302
cpu: 10m
303303
memory: 32Mi
304304
imagePullPolicy: IfNotPresent
305-
sidecarImage: radondb/mysql57-sidecar:v2.2.1
305+
sidecarImage: radondb/mysql57-sidecar:v2.3.0
306306
description: PodPolicy defines the policy to extra specification.
307307
properties:
308308
affinity:
@@ -1232,7 +1232,7 @@ spec:
12321232
schedulerName:
12331233
type: string
12341234
sidecarImage:
1235-
default: radondb/mysql57-sidecar:v2.2.1
1235+
default: radondb/mysql57-sidecar:v2.3.0
12361236
description: To specify the image that will be used for sidecar
12371237
container.
12381238
type: string
@@ -1304,7 +1304,7 @@ spec:
13041304
default:
13051305
admitDefeatHearbeatCount: 5
13061306
electionTimeout: 10000
1307-
image: radondb/xenon:v2.2.1
1307+
image: radondb/xenon:v2.3.0
13081308
resources:
13091309
limits:
13101310
cpu: 100m
@@ -1331,7 +1331,7 @@ spec:
13311331
automatically rebuild the invalid node.
13321332
type: boolean
13331333
image:
1334-
default: radondb/xenon:v2.2.1
1334+
default: radondb/xenon:v2.3.0
13351335
description: To specify the image that will be used for xenon
13361336
container.
13371337
type: string

‎config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: controller
1515
newName: radondb/mysql-operator
16-
newTag: v2.2.1
16+
newTag: v2.3.0

‎config/samples/mysql_v1alpha1_backup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: backup-sample
55
spec:
66
# Add fields here
7-
image: radondb/mysql57-sidecar:v2.2.1
7+
image: radondb/mysql57-sidecar:v2.3.0
88
# hostname if empty, use the leader as hostname
99
hostName: sample-mysql-0
1010
clusterName: sample

‎config/samples/mysql_v1alpha1_mysqlcluster.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
memory: 1Gi
3939

4040
xenonOpts:
41-
image: radondb/xenon:v2.2.1
41+
image: radondb/xenon:v2.3.0
4242
admitDefeatHearbeatCount: 5
4343
electionTimeout: 10000
4444

@@ -64,7 +64,7 @@ spec:
6464

6565
podPolicy:
6666
imagePullPolicy: IfNotPresent
67-
sidecarImage: radondb/mysql57-sidecar:v2.2.1
67+
sidecarImage: radondb/mysql57-sidecar:v2.3.0
6868
busyboxImage: busybox:1.32
6969

7070
slowLogTail: false

‎config/samples/mysql_v1alpha1_mysqlcluster_backup_schedule_demo.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
memory: 1Gi
3535

3636
xenonOpts:
37-
image: radondb/xenon:v2.2.1
37+
image: radondb/xenon:v2.3.0
3838
admitDefeatHearbeatCount: 5
3939
electionTimeout: 10000
4040

@@ -60,7 +60,7 @@ spec:
6060

6161
podPolicy:
6262
imagePullPolicy: IfNotPresent
63-
sidecarImage: radondb/mysql57-sidecar:v2.2.1
63+
sidecarImage: radondb/mysql57-sidecar:v2.3.0
6464
busyboxImage: busybox:1.32
6565

6666
slowLogTail: false

‎config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
memory: 1Gi
3636

3737
xenonOpts:
38-
image: radondb/xenon:v2.2.1
38+
image: radondb/xenon:v2.3.0
3939
admitDefeatHearbeatCount: 5
4040
electionTimeout: 10000
4141

@@ -61,7 +61,7 @@ spec:
6161

6262
podPolicy:
6363
imagePullPolicy: IfNotPresent
64-
sidecarImage: radondb/mysql80-sidecar:v2.2.1
64+
sidecarImage: radondb/mysql80-sidecar:v2.3.0
6565
busyboxImage: busybox:1.32
6666

6767
slowLogTail: false

‎config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
memory: 1Gi
3535

3636
xenonOpts:
37-
image: radondb/xenon:v2.2.1
37+
image: radondb/xenon:v2.3.0
3838
admitDefeatHearbeatCount: 5
3939
electionTimeout: 10000
4040

@@ -60,7 +60,7 @@ spec:
6060

6161
podPolicy:
6262
imagePullPolicy: IfNotPresent
63-
sidecarImage: radondb/mysql57-sidecar:v2.2.1
63+
sidecarImage: radondb/mysql57-sidecar:v2.3.0
6464
busyboxImage: busybox:1.32
6565

6666
slowLogTail: false

‎test/e2e/framework/mysqlcluster.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ metadata:
4242
spec:
4343
replicas: %d
4444
xenonOpts:
45-
image: radondb/xenon:v2.2.1
45+
image: radondb/xenon:v2.3.0
4646
`
4747
MySQL57ReleaseAssetURL = "https://github.com/radondb/radondb-mysql-kubernetes/releases/latest/download/mysql_v1alpha1_mysqlcluster.yaml"
4848
)

‎test/e2e/framework/test_context.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ const (
3636
LogDirPrefix = ""
3737

3838
// // Image path of mysql operator.
39-
// OperatorImagePath = "radondb/mysql-operator:v2.2.1"
39+
// OperatorImagePath = "radondb/mysql-operator:v2.3.0"
4040
// Image path for mysql sidecar.
41-
SidecarImagePath = "radondb/mysql57-sidecar:v2.2.1"
41+
SidecarImagePath = "radondb/mysql57-sidecar:v2.3.0"
4242

4343
// The namespace where the resource created by E2E.
4444
E2ETestNamespace = "radondb-mysql-e2e"

0 commit comments

Comments
 (0)