diff --git a/api/v1alpha1/perconaservermysql_types.go b/api/v1alpha1/perconaservermysql_types.go index 033ee4bfe..00b42880c 100644 --- a/api/v1alpha1/perconaservermysql_types.go +++ b/api/v1alpha1/perconaservermysql_types.go @@ -369,16 +369,15 @@ type BinlogServerSpec struct { Storage BinlogServerStorageSpec `json:"storage"` // The number of seconds the MySQL client library will wait to establish a connection with a remote host - ConnectTimeout int32 `json:"connectTimeout,omitempty"` + ConnectTimeout int32 `json:"connectTimeout"` // The number of seconds the MySQL client library will wait to read data from a remote server. - ReadTimeout int32 `json:"readTimeout,omitempty"` + ReadTimeout int32 `json:"readTimeout"` // The number of seconds the MySQL client library will wait to write data to a remote server. - WriteTimeout int32 `json:"writeTimeout,omitempty"` - + WriteTimeout int32 `json:"writeTimeout"` // Specifies the server ID that the utility will be using when connecting to a remote MySQL server - ServerID int32 `json:"serverId,omitempty"` + ServerID int32 `json:"serverId"` // The number of seconds the utility will spend in disconnected mode between reconnection attempts. - IdleTime int32 `json:"idleTime,omitempty"` + IdleTime int32 `json:"idleTime"` PodSpec `json:",inline"` } diff --git a/config/crd/bases/ps.percona.com_perconaservermysqls.yaml b/config/crd/bases/ps.percona.com_perconaservermysqls.yaml index cdfad6138..999ae18f0 100644 --- a/config/crd/bases/ps.percona.com_perconaservermysqls.yaml +++ b/config/crd/bases/ps.percona.com_perconaservermysqls.yaml @@ -1374,8 +1374,13 @@ spec: format: int32 type: integer required: + - connectTimeout + - idleTime - image + - readTimeout + - serverId - storage + - writeTimeout type: object enabled: type: boolean diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 350c2ac2d..4d9b6f84a 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -3282,8 +3282,13 @@ spec: format: int32 type: integer required: + - connectTimeout + - idleTime - image + - readTimeout + - serverId - storage + - writeTimeout type: object enabled: type: boolean diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 5d19d1a8e..733710546 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -3282,8 +3282,13 @@ spec: format: int32 type: integer required: + - connectTimeout + - idleTime - image + - readTimeout + - serverId - storage + - writeTimeout type: object enabled: type: boolean diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 30169ac4b..d13fa6e05 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -3282,8 +3282,13 @@ spec: format: int32 type: integer required: + - connectTimeout + - idleTime - image + - readTimeout + - serverId - storage + - writeTimeout type: object enabled: type: boolean diff --git a/pkg/controller/ps/controller.go b/pkg/controller/ps/controller.go index ebee799f5..4e99dc476 100644 --- a/pkg/controller/ps/controller.go +++ b/pkg/controller/ps/controller.go @@ -1160,7 +1160,7 @@ func (r *PerconaServerMySQLReconciler) reconcileBinlogServer(ctx context.Context s3 := cr.Spec.Backup.PiTR.BinlogServer.Storage.S3 if s3 != nil && len(s3.CredentialsSecret) == 0 { - logger.Info("You need to set spec.backup.pitr.binlogServer.s3.credentialsSecret to upload binlogs to s3") + logger.Info("setting spec.backup.pitr.binlogServer.s3.credentialsSecret is required to upload binlogs to s3") return nil } diff --git a/pkg/controller/ps/controller_test.go b/pkg/controller/ps/controller_test.go index ecca4b866..039254346 100644 --- a/pkg/controller/ps/controller_test.go +++ b/pkg/controller/ps/controller_test.go @@ -470,7 +470,7 @@ var _ = Describe("Reconcile Binlog Server", Ordered, func() { PodSpec: psv1alpha1.PodSpec{ Size: 1, ContainerSpec: psv1alpha1.ContainerSpec{ - Image: "perconalab/percona-server-mysql-operator:binlog-server", + Image: "binlog-server-image", }, }, }