Skip to content

Commit 4feba83

Browse files
committed
*: Set default version to v2.2.0.
1. Set the default version to v2.2.0. 2. Set the default value of InitTokuDB to false.
1 parent 2e82696 commit 4feba83

File tree

7 files changed

+27
-14
lines changed

7 files changed

+27
-14
lines changed

api/v1alpha1/mysqlcluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ type MysqlOpts struct {
120120

121121
// InitTokuDB represents if install tokudb engine.
122122
// +optional
123-
// +kubebuilder:default:=true
123+
// +kubebuilder:default:=false
124124
InitTokuDB bool `json:"initTokuDB,omitempty"`
125125

126126
// A map[string]string that will be passed to my.cnf file.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
description: HostName represents the host for which to take backup
4949
type: string
5050
image:
51-
default: radondb/mysql-sidecar:latest
51+
default: radondb/mysql57-sidecar:v2.2.0
5252
description: To specify the image that will be used for sidecar container.
5353
type: string
5454
required:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ spec:
137137
description: Name for new database to create.
138138
type: string
139139
initTokuDB:
140-
default: true
140+
default: false
141141
description: InitTokuDB represents if install tokudb engine.
142142
type: boolean
143143
mysqlConf:
@@ -252,7 +252,7 @@ spec:
252252
cpu: 10m
253253
memory: 32Mi
254254
imagePullPolicy: IfNotPresent
255-
sidecarImage: radondb/mysql-sidecar:latest
255+
sidecarImage: radondb/mysql57-sidecar:v2.2.0
256256
description: PodPolicy defines the policy to extra specification.
257257
properties:
258258
affinity:
@@ -1182,7 +1182,7 @@ spec:
11821182
schedulerName:
11831183
type: string
11841184
sidecarImage:
1185-
default: radondb/mysql-sidecar:latest
1185+
default: radondb/mysql57-sidecar:v2.2.0
11861186
description: To specify the image that will be used for sidecar
11871187
container.
11881188
type: string

charts/mysql-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tolerationSeconds: 30
2121

2222
manager:
2323
image: radondb/mysql-operator
24-
tag: latest
24+
tag: v2.2.0
2525
resources: {}
2626
# We usually recommend not to specify default resources and to leave this as a conscious
2727
# choice for the user. This also increases chances charts run on environments with little

config/samples/mysql_v1alpha1_mysqlcluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262

6363
podPolicy:
6464
imagePullPolicy: IfNotPresent
65-
sidecarImage: radondb/mysql-sidecar:latest
65+
sidecarImage: radondb/mysql57-sidecar:v2.2.0
6666
busyboxImage: busybox:1.32
6767

6868
slowLogTail: false

config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,74 @@
11
apiVersion: mysql.radondb.com/v1alpha1
22
kind: MysqlCluster
33
metadata:
4-
name: mysql8-sample
4+
name: sample
55
spec:
66
replicas: 3
77
mysqlVersion: "8.0"
8+
89
# the backupSecretName specify the secret file name which store S3 information,
910
# if you want S3 backup or restore, please create backup_secret.yaml, uncomment below and fill secret name:
1011
# backupSecretName:
11-
12+
1213
# if you want create mysqlcluster from S3, uncomment and fill the directory in S3 bucket below:
13-
# restoreFrom: "backup_2022324174848"
14+
# restoreFrom:
15+
1416
mysqlOpts:
1517
rootPassword: "RadonDB@123"
1618
rootHost: localhost
1719
user: radondb_usr
1820
password: RadonDB@123
1921
database: radondb
22+
## tokudb is not supported in mysql8.
23+
# initTokuDB: false
24+
2025
# A simple map between string and string.
2126
# Such as:
2227
# mysqlConf:
2328
# expire_logs_days: "7"
2429
mysqlConf: {}
30+
2531
resources:
2632
requests:
2733
cpu: 100m
2834
memory: 256Mi
2935
limits:
3036
cpu: 500m
3137
memory: 1Gi
38+
3239
xenonOpts:
3340
image: radondb/xenon:1.1.5-alpha
3441
admitDefeatHearbeatCount: 5
3542
electionTimeout: 10000
43+
3644
resources:
3745
requests:
3846
cpu: 50m
3947
memory: 128Mi
4048
limits:
4149
cpu: 100m
4250
memory: 256Mi
51+
4352
metricsOpts:
4453
enabled: false
4554
image: prom/mysqld-exporter:v0.12.1
55+
4656
resources:
4757
requests:
4858
cpu: 10m
4959
memory: 32Mi
5060
limits:
5161
cpu: 100m
5262
memory: 128Mi
63+
5364
podPolicy:
54-
imagePullPolicy: Always
65+
imagePullPolicy: IfNotPresent
5566
sidecarImage: radondb/mysql80-sidecar:v2.2.0
5667
busyboxImage: busybox:1.32
68+
5769
slowLogTail: false
5870
auditLogTail: false
71+
5972
labels: {}
6073
annotations: {}
6174
affinity: {}
@@ -67,10 +80,10 @@ spec:
6780
requests:
6881
cpu: 10m
6982
memory: 32Mi
83+
7084
persistence:
7185
enabled: true
7286
accessModes:
73-
- ReadWriteOnce
87+
- ReadWriteOnce
7488
#storageClass: ""
7589
size: 20Gi
76-
backupSecretName: sample-backup-secret

config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262

6363
podPolicy:
6464
imagePullPolicy: IfNotPresent
65-
sidecarImage: radondb/mysql-sidecar:latest
65+
sidecarImage: radondb/mysql57-sidecar:v2.2.0
6666
busyboxImage: busybox:1.32
6767

6868
slowLogTail: false

0 commit comments

Comments
 (0)