Skip to content

K8SPS-353 add required pitr binlog fields #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gkech merged 2 commits into from
Jan 29, 2025
Merged

K8SPS-353 add required pitr binlog fields #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30942fd
K8SPS-353 add required pitr fields
gkech Jan 28, 2025
393029a
Merge branch 'main' into K8SPS-353-required-fields-pitr
gkech Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions api/v1alpha1/perconaservermysql_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Copy link
Copy Markdown
Contributor Author

@gkech gkech Jan 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like the annotation from kubebuilder is not needed

// 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"`
}
Expand Down
5 changes: 5 additions & 0 deletions config/crd/bases/ps.percona.com_perconaservermysqls.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,8 +1374,13 @@ spec:
format: int32
type: integer
required:
- connectTimeout
- idleTime
- image
- readTimeout
- serverId
- storage
- writeTimeout
type: object
enabled:
type: boolean
Expand Down
5 changes: 5 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,8 +3282,13 @@ spec:
format: int32
type: integer
required:
- connectTimeout
- idleTime
- image
- readTimeout
- serverId
- storage
- writeTimeout
type: object
enabled:
type: boolean
Expand Down
5 changes: 5 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,8 +3282,13 @@ spec:
format: int32
type: integer
required:
- connectTimeout
- idleTime
- image
- readTimeout
- serverId
- storage
- writeTimeout
type: object
enabled:
type: boolean
Expand Down
5 changes: 5 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3282,8 +3282,13 @@ spec:
format: int32
type: integer
required:
- connectTimeout
- idleTime
- image
- readTimeout
- serverId
- storage
- writeTimeout
type: object
enabled:
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ps/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ps/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
}
Expand Down