K8SPS-353 add required pitr fields

Author: gkech

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"`
 }

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

config/manager/cluster/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: perconalab/percona-server-mysql-operator
   newName: perconalab/percona-server-mysql-operator
-  newTag: main
+  newTag: k8sps-353-required-fields-pitr

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: perconalab/percona-server-mysql-operator
   newName: perconalab/percona-server-mysql-operator
-  newTag: main
+  newTag: k8sps-353-required-fields-pitr

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
@@ -11643,7 +11648,7 @@ spec:
               fieldPath: metadata.namespace
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: perconalab/percona-server-mysql-operator:main
+        image: perconalab/percona-server-mysql-operator:k8sps-353-required-fields-pitr
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

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

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
@@ -11686,7 +11691,7 @@ spec:
           value: ""
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: perconalab/percona-server-mysql-operator:main
+        image: perconalab/percona-server-mysql-operator:k8sps-353-required-fields-pitr
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

deploy/cw-operator.yaml

@@ -48,7 +48,7 @@ spec:
           value: ""
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: perconalab/percona-server-mysql-operator:main
+        image: perconalab/percona-server-mysql-operator:k8sps-353-required-fields-pitr
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

deploy/operator.yaml

@@ -51,7 +51,7 @@ spec:
               fieldPath: metadata.namespace
         - name: DISABLE_TELEMETRY
           value: "false"
-        image: perconalab/percona-server-mysql-operator:main
+        image: perconalab/percona-server-mysql-operator:k8sps-353-required-fields-pitr
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

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
 	}