K8SPS-716: add .spec.pitr.backupSource.binlogServer to the ps-restore

charts/ps-db/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.1.0"
+appVersion: "1.2.0"
 description: A Helm chart for installing Percona Server Databases using the PS Operator.
 name: ps-db
 home: https://www.percona.com/doc/kubernetes-operator-for-mysql/ps
-version: 1.1.0
+version: 1.2.0
 maintainers:
   - name: jvpasinatto
     email: julio.pasinatto@percona.com

charts/ps-db/templates/cluster.yaml

@@ -27,6 +27,32 @@ spec:
   {{- if .Values.enableVolumeExpansion }}
   enableVolumeExpansion: {{ .Values.enableVolumeExpansion }}
   {{- end }}
+  {{- if .Values.storageScaling }}
+  {{- $storageScaling := .Values.storageScaling }}
+  storageScaling:
+    {{- if $storageScaling.enableVolumeScaling }}
+    enableVolumeScaling: {{ $storageScaling.enableVolumeScaling }}
+    {{- end }}
+    {{- if $storageScaling.enableExternalAutoscaling }}
+    enableExternalAutoscaling: {{ $storageScaling.enableExternalAutoscaling }}
+    {{- end }}
+    {{- if $storageScaling.autoscaling }}
+    {{- $autoscaling := $storageScaling.autoscaling }}
+    autoscaling:
+      {{- if $autoscaling.enabled }}
+      enabled: {{ $autoscaling.enabled }}
+      {{- end }}
+      {{- if $autoscaling.triggerThresholdPercent }}
+      triggerThresholdPercent: {{ $autoscaling.triggerThresholdPercent }}
+      {{- end }}
+      {{- if $autoscaling.growthStep }}
+      growthStep: {{ $autoscaling.growthStep }}
+      {{- end }}
+      {{- if $autoscaling.maxSize }}
+      maxSize: {{ $autoscaling.maxSize }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
   {{- if .Values.unsafeFlags }}
   unsafeFlags:
 {{ .Values.unsafeFlags | toYaml | indent 4 }}
@@ -319,6 +345,24 @@ spec:
 {{ tpl ($haproxy.resources.requests | toYaml) $ | indent 10 }}
         limits:
 {{ tpl ($haproxy.resources.limits | toYaml) $ | indent 10 }}
+      {{- if $haproxy.sidecarResources }}
+      sidecarResources:
+        {{- range $name, $resources := $haproxy.sidecarResources }}
+        {{ $name }}:
+          {{- if $resources.claims }}
+          claims:
+{{ tpl ($resources.claims | toYaml) $ | indent 12 }}
+          {{- end }}
+          {{- if $resources.limits }}
+          limits:
+{{ tpl ($resources.limits | toYaml) $ | indent 12 }}
+          {{- end }}
+          {{- if $resources.requests }}
+          requests:
+{{ tpl ($resources.requests | toYaml) $ | indent 12 }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
       {{- if $haproxy.env }}
       env:
 {{ $haproxy.env | toYaml | indent 8 }}
@@ -589,6 +633,10 @@ spec:
     {{- end }}
     {{- if $orc.gracePeriod }}
     gracePeriod: {{ $orc.gracePeriod }}
+    {{- end }}
+    {{- if $orc.configuration }}
+    configuration: |
+{{- tpl $orc.configuration $ | nindent 6 }}
     {{- end }}
     {{- if $orc.priorityClassName }}
     priorityClassName: {{ $orc.priorityClassName }}
@@ -691,6 +739,10 @@ spec:
   {{- if $backup.sourcePod }}
     sourcePod: {{ $backup.sourcePod }}
   {{- end }}
+  {{- if $backup.encryptionKeySecret }}
+    encryptionKeySecret:
+{{ $backup.encryptionKeySecret | toYaml | indent 6 }}
+  {{- end }}
   {{- if not $backup.enabled }}
     enabled: false
   {{- else }}

charts/ps-db/values.yaml

@@ -16,18 +16,25 @@ finalizers:
 #    orchestratorSize: false
 #    proxy: false
 #    proxySize: false
-crVersion: 1.1.0
-enableVolumeExpansion: false
+crVersion: 1.2.0
+# storageScaling:
+#   enableVolumeScaling: false
+#   enableExternalAutoscaling: false
+#   autoscaling:
+#     enabled: false
+#     triggerThresholdPercent: 80
+#     growthStep: 2Gi
+#     maxSize: 100Gi
 pause: false
-# initImage: percona/percona-server-mysql-operator:1.1.0
+# initImage: percona/percona-server-mysql-operator:1.2.0
 
 updateStrategy: SmartUpdate
 upgradeOptions:
   versionServiceEndpoint: https://check.percona.com
   apply: disabled
 
 # initContainer:
-#   image: percona/percona-server-mysql-operator:1.1.0
+#   image: percona/percona-server-mysql-operator:1.2.0
 #   containerSecurityContext:
 #     privileged: false
 #     runAsUser: 1001
@@ -72,11 +79,11 @@ mysql:
     # minAvailable: 0
   image:
     repository: percona/percona-server
-    tag: 8.4.8-8.1
+    tag: 8.4.10-10.1
   imagePullPolicy: Always
   imagePullSecrets: []
   # initContainer:
-  #   image: percona/percona-server-mysql-operator:1.1.0
+  #   image: percona/percona-server-mysql-operator:1.2.0
   #   containerSecurityContext:
   #     privileged: false
   #     runAsUser: 1001
@@ -153,8 +160,9 @@ mysql:
   #   whenUnsatisfiable: DoNotSchedule
 
   # expose:
-  #   enabled: true
-  #   type: ClusterIP
+    # allocateLoadBalancerNodePorts: false
+    # enabled: true
+    # type: ClusterIP
     # annotations:
     #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
     #   service.beta.kubernetes.io/aws-load-balancer-type: nlb
@@ -166,6 +174,7 @@ mysql:
     #   - 10.0.0.0/8
 
   exposePrimary:
+    # allocateLoadBalancerNodePorts: false
     enabled: true
     # type: ClusterIP
     # annotations:
@@ -249,7 +258,7 @@ proxy:
     imagePullPolicy: Always
     imagePullSecrets: []
     # initContainer:
-    #   image: percona/percona-server-mysql-operator:1.1.0
+    #   image: percona/percona-server-mysql-operator:1.2.0
     #   containerSecurityContext:
     #     privileged: false
     #     runAsUser: 1001
@@ -273,6 +282,15 @@ proxy:
         cpu: 600m
       limits: {}
 
+    # sidecarResources:
+    #   mysql-monit:
+    #     limits:
+    #       cpu: 100m
+    #       memory: 128Mi
+    #     requests:
+    #       cpu: 50m
+    #       memory: 64Mi
+
     # env:
     # - name: HA_CONNECTION_TIMEOUT
     #   value: "1000"
@@ -378,6 +396,7 @@ proxy:
     #   - 1001
     # serviceAccountName: percona-server-mysql-operator-workload
     # expose:
+      # allocateLoadBalancerNodePorts: false
       # type: ClusterIP
       # annotations:
       #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
@@ -393,11 +412,11 @@ proxy:
     enabled: false
     image:
       repository: percona/percona-mysql-router
-      tag: 8.4.8
+      tag: 8.4.10
     imagePullPolicy: Always
     imagePullSecrets: []
     # initContainer:
-    #   image: percona/percona-server-mysql-operator:1.1.0
+    #   image: percona/percona-server-mysql-operator:1.2.0
     #   containerSecurityContext:
     #     privileged: false
     #     runAsUser: 1001
@@ -526,6 +545,7 @@ proxy:
     #   - 1001
     # serviceAccountName: percona-server-mysql-operator-workload
     # expose:
+      # allocateLoadBalancerNodePorts: false
       # type: ClusterIP
       # annotations:
       #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
@@ -541,12 +561,12 @@ orchestrator:
   enabled: false
   image:
     repository: percona/percona-orchestrator
-    tag: 3.2.6-20
+    tag: 3.2.6-22
   imagePullPolicy: Always
   imagePullSecrets: []
   # serviceAccountName: percona-server-mysql-operator-orchestrator
   # initContainer:
-  #   image: percona/percona-server-mysql-operator:1.1.0
+  #   image: percona/percona-server-mysql-operator:1.2.0
   #   containerSecurityContext:
   #     privileged: false
   #     runAsUser: 1001
@@ -613,6 +633,11 @@ orchestrator:
 
   gracePeriod: 30
 
+  # configuration: |
+  #   {
+  #     "FailMasterPromotionOnLagMinutes": 10
+  #   }
+
   # runtimeClassName: image-rc
   # priorityClassName: high-priority
   # schedulerName: mycustom-scheduler
@@ -636,6 +661,7 @@ orchestrator:
   #   supplementalGroups:
   #   - 1001
   # expose:
+    # allocateLoadBalancerNodePorts: false
     # type: ClusterIP
     # annotations:
     #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: tcp
@@ -651,7 +677,7 @@ pmm:
   enabled: false
   image:
     repository: percona/pmm-client
-    tag: 3.7.0
+    tag: 3.8.1
   imagePullPolicy: Always
 #  readinessProbe:
 #    initialDelaySeconds: 15
@@ -676,7 +702,7 @@ pmm:
 backup:
   enabled: true
   # initContainer:
-  #   image: percona/percona-server-mysql-operator:1.1.0
+  #   image: percona/percona-server-mysql-operator:1.2.0
   #   containerSecurityContext:
   #     privileged: false
   #     runAsUser: 1001
@@ -689,9 +715,12 @@ backup:
   #       memory: 200M
   #       cpu: 200m
 #  sourcePod: ps-cluster1-mysql-1
+#  encryptionKeySecret:
+#    key: encryptionKey
+#    name: my-encryption-key-secret
   image:
     repository: percona/percona-xtrabackup
-    tag: 8.4.0-5.1
+    tag: 8.4.0-6.1
 #  schedule:
 #    - name: "sat-night-backup"
 #      schedule: "0 0 * * 6"
@@ -715,20 +744,29 @@ backup:
   storages: {}
     # azure-blob:
     #   type: azure
+    #   encryptionKeySecret:
+    #     key: encryptionKey
+    #     name: my-azure-encryption-key-secret
     #   azure:
     #     container: CONTAINER-NAME
     #     prefix: PREFIX-NAME
     #     endpointUrl: https://accountName.blob.core.windows.net
     #     credentialsSecret: SECRET-NAME
     # gcp-cs:
     #   type: gcs
+    #   encryptionKeySecret:
+    #     key: encryptionKey
+    #     name: my-gcs-encryption-key-secret
     #   gcs:
     #     bucket: BUCKET-NAME
     #     prefix: PREFIX-NAME
     #     endpointUrl: https://storage.googleapis.com
     #     credentialsSecret: SECRET-NAME
     # s3-us-west:
     #   type: s3
+    #   encryptionKeySecret:
+    #     key: encryptionKey
+    #     name: my-s3-encryption-key-secret
     #   verifyTLS: true
     #   nodeSelector:
     #     storage: tape
@@ -789,7 +827,7 @@ backup:
   # pitr:
   #   enabled: false
   #   binlogServer:
-  #     image: percona/percona-server-mysql-operator:1.1.0-binlog-server-0.2.1
+  #     image: perconalab/percona-binlog-server:0.3.1
   #     imagePullPolicy: Always
   #     imagePullSecrets:
   #       - name: my-secret-1
@@ -821,7 +859,7 @@ backup:
 toolkit:
   image:
     repository: percona/percona-toolkit
-    tag: 3.7.1
+    tag: 3.7.1-4
   imagePullPolicy: Always
   resources:
     requests: {}

charts/ps-operator/Chart.yaml

@@ -1,13 +1,15 @@
 apiVersion: v2
-appVersion: "1.1.0"
+appVersion: "1.2.0"
 description: A Helm chart for Deploying the Percona Operator for MySQL (based on Percona Server for MySQL)
 name: ps-operator
 home: https://docs.percona.com/percona-operator-for-mysql/ps/
-version: 1.1.0
+version: 1.2.0
 maintainers:
   - name: jvpasinatto
     email: julio.pasinatto@percona.com
   - name: nmarukovich
     email: natalia.marukovich@percona.com
   - name: eleo007
     email: eleonora.zinchenko@percona.com
+  - name: valmiranogueira
+    email: valmira.nogueira@percona.com

charts/ps-operator/README.md

@@ -19,15 +19,15 @@ To install the chart with the `ps` release name using a dedicated namespace (rec
 
 ```sh
 helm repo add percona https://percona.github.io/percona-helm-charts/
-helm install my-operator percona/ps-operator --version 1.1.0 --namespace my-namespace
+helm install my-operator percona/ps-operator --version 1.2.0 --namespace my-namespace
 ```
 
 The chart can be customized using the following configurable parameters:
 
 | Parameter               | Description                                                                                    | Default                                 |
 | ----------------------- | ---------------------------------------------------------------------------------------------- | --------------------------------------- |
 | `image.repository`      | PS Operator Container image name                                                               | `percona/percona-server-mysql-operator` |
-| `image.tag`             | PS Operator Container image tag                                                                | `1.1.0`                                 |
+| `image.tag`             | PS Operator Container image tag                                                                | `1.2.0`                                 |
 | `image.pullPolicy`      | PS Operator Container pull policy                                                              | `IfNotPresent`                          |
 | `imagePullSecrets`      | PS Operator Pod pull secret                                                                    | `[]`                                    |
 | `replicaCount`          | PS Operator Pod quantity                                                                       | `1`                                     |
@@ -38,6 +38,7 @@ The chart can be customized using the following configurable parameters:
 | `serviceAccount.create` | If false the ServiceAccounts will not be created. The ServiceAccounts must be created manually | `true`                                  |
 | `env.logStructured`     | Enable JSON format for logs                                                                    | `false`                                 |
 | `env.logLevel`          | Set appropriate log level (INFO, DEBUG, ERROR)                                                 | `INFO`                                  |
+| `env.maxConcurrentReconciles` | Limits the number of parallel cluster reconciles                                         | `1`                                     |
 | `disableTelemetry`      | Disable sending PS Operator telemetry data to Percona                                          | `false`                                 |
 | `watchNamespace`        | Set this variable if the target cluster namespace differs from operator's namespace            | `.Release.Namespace`                    |
 | `watchAllNamespaces`    | Set if operator should be deployed in cluster-wide mode                                        | `false`                                 |