diff --git a/api/v1alpha1/mysqlcluster_types.go b/api/v1alpha1/mysqlcluster_types.go index 1374ce54..d1490144 100644 --- a/api/v1alpha1/mysqlcluster_types.go +++ b/api/v1alpha1/mysqlcluster_types.go @@ -48,7 +48,7 @@ type MysqlClusterSpec struct { // XenonOpts is the options of xenon container. // +optional - // +kubebuilder:default:={image: "radondb/xenon:1.1.5-alpha", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}} + // +kubebuilder:default:={image: "radondb/xenon:v2.2.1", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}} XenonOpts XenonOpts `json:"xenonOpts,omitempty"` // MetricsOpts is the options of metrics container. @@ -159,7 +159,7 @@ type MysqlOpts struct { type XenonOpts struct { // To specify the image that will be used for xenon container. // +optional - // +kubebuilder:default:="radondb/xenon:1.1.5-alpha" + // +kubebuilder:default:="radondb/xenon:v2.2.1" Image string `json:"image,omitempty"` // High available component admit defeat heartbeat count. diff --git a/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml b/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml index fca5d6c2..f9607898 100644 --- a/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml +++ b/charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml @@ -1276,7 +1276,7 @@ spec: default: admitDefeatHearbeatCount: 5 electionTimeout: 10000 - image: radondb/xenon:1.1.5-alpha + image: radondb/xenon:v2.2.1 resources: limits: cpu: 100m @@ -1303,7 +1303,7 @@ spec: automatically rebuild the invalid node. type: boolean image: - default: radondb/xenon:1.1.5-alpha + default: radondb/xenon:v2.2.1 description: To specify the image that will be used for xenon container. type: string diff --git a/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml b/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml index fca5d6c2..f9607898 100644 --- a/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml +++ b/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml @@ -1276,7 +1276,7 @@ spec: default: admitDefeatHearbeatCount: 5 electionTimeout: 10000 - image: radondb/xenon:1.1.5-alpha + image: radondb/xenon:v2.2.1 resources: limits: cpu: 100m @@ -1303,7 +1303,7 @@ spec: automatically rebuild the invalid node. type: boolean image: - default: radondb/xenon:1.1.5-alpha + default: radondb/xenon:v2.2.1 description: To specify the image that will be used for xenon container. type: string diff --git a/config/samples/mysql_v1alpha1_mysqlcluster.yaml b/config/samples/mysql_v1alpha1_mysqlcluster.yaml index 8f131f91..b86a4d7a 100644 --- a/config/samples/mysql_v1alpha1_mysqlcluster.yaml +++ b/config/samples/mysql_v1alpha1_mysqlcluster.yaml @@ -38,7 +38,7 @@ spec: memory: 1Gi xenonOpts: - image: radondb/xenon:1.1.5-alpha + image: radondb/xenon:v2.2.1 admitDefeatHearbeatCount: 5 electionTimeout: 10000 diff --git a/config/samples/mysql_v1alpha1_mysqlcluster_backup_schedule_demo.yaml b/config/samples/mysql_v1alpha1_mysqlcluster_backup_schedule_demo.yaml index 4ae4b27b..9efcf5b8 100644 --- a/config/samples/mysql_v1alpha1_mysqlcluster_backup_schedule_demo.yaml +++ b/config/samples/mysql_v1alpha1_mysqlcluster_backup_schedule_demo.yaml @@ -36,7 +36,7 @@ spec: memory: 1Gi xenonOpts: - image: radondb/xenon:1.1.5-alpha + image: radondb/xenon:v2.2.1 admitDefeatHearbeatCount: 5 electionTimeout: 10000 diff --git a/config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml b/config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml index 0494a7f1..197ae256 100644 --- a/config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml +++ b/config/samples/mysql_v1alpha1_mysqlcluster_mysql8.yaml @@ -35,7 +35,7 @@ spec: memory: 1Gi xenonOpts: - image: radondb/xenon:1.1.5-alpha + image: radondb/xenon:v2.2.1 admitDefeatHearbeatCount: 5 electionTimeout: 10000 diff --git a/config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml b/config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml index 816ad961..e4657260 100644 --- a/config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml +++ b/config/samples/mysql_v1alpha1_mysqlcluster_podAntiAffinity.yaml @@ -34,7 +34,7 @@ spec: memory: 1Gi xenonOpts: - image: radondb/xenon:1.1.5-alpha + image: radondb/xenon:v2.2.1 admitDefeatHearbeatCount: 5 electionTimeout: 10000 diff --git a/docs/en-us/config_para.md b/docs/en-us/config_para.md index e174202d..bcff779b 100644 --- a/docs/en-us/config_para.md +++ b/docs/en-us/config_para.md @@ -22,7 +22,7 @@ Contents | MysqlOpts.InitTokuDB | TokuDB enabled | true | | MysqlOpts.MysqlConf | MySQL configuration | - | | MysqlOpts.Resources | MySQL container resources | Reserve: CPU 100M, memory 256Mi;
limit: CPU 500M, memory 1Gi | -| XenonOpts.Image | Xenon (HA MySQL) image | radondb/xenon:1.1.5-alpha | +| XenonOpts.Image | Xenon (HA MySQL) image | radondb/xenon:v2.2.1 | | XenonOpts.AdmitDefeatHearbeatCount | Maximum heartbeat failures allowed | 5 | | XenonOpts.ElectionTimeout | Election timeout period (milliseconds) | 10000 ms | | XenonOpts.Resources | Xenon container resources | Reserve: CPU 50M, memory 128Mi;
limit: CPU 100M, memory 256Mi | diff --git a/docs/zh-cn/config_para.md b/docs/zh-cn/config_para.md index dec435fb..7bc7bfc4 100644 --- a/docs/zh-cn/config_para.md +++ b/docs/zh-cn/config_para.md @@ -22,7 +22,7 @@ | MysqlOpts.InitTokuDB | 是否启用 TokuDB | true | | MysqlOpts.MysqlConf | MySQL 配置 | - | | MysqlOpts.Resources | MySQL 容器配额 | 预留：CPU 100M，内存 256Mi；
限制：CPU 500M，内存 1Gi | -| XenonOpts.Image | Xenon （高可用组件）镜像 | radondb/xenon:1.1.5-alpha | +| XenonOpts.Image | Xenon （高可用组件）镜像 | radondb/xenon:v2.2.1 | | XenonOpts.AdmitDefeatHearbeatCount | 允许的最大心跳检测失败次数 | 5 | | XenonOpts.ElectionTimeout | 选举超时时间（单位为毫秒） | 10000ms | | XenonOpts.Resources | Xenon 容器配额 | 预留：CPU 50M，内存 128Mi；
限制：CPU 100M，内存 256Mi |