Merge pull request #51 from percona/pxco-170

Update for PXCO 1.7.0 release
percona · Feb 5, 2021 · 5997787 · 5997787
2 parents 9ac3c96 + 772551c
commit 5997787
Show file tree

Hide file tree

Showing 16 changed files with 146 additions and 56 deletions.
diff --git a/charts/psmdb-db/Chart.yaml b/charts/psmdb-db/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "1.6.0"
 description: A Helm chart for installing Percona Server MongoDB Cluster Databases using the PSMDB Operator.
 name: psmdb-db
 home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
-version: 0.1.1
+version: 0.1.2
 maintainers:
   - name: cap1984
     email: [email protected]

diff --git a/charts/psmdb-db/values.yaml b/charts/psmdb-db/values.yaml
@@ -6,7 +6,7 @@
 # platform: kubernetes
 
 # Cluster DNS Suffix
-# DNSsuffix: .svc.cluster.local
+# DNSsuffix: svc.cluster.local
 
 pause: false
 allowUnsafeConfigurations: false

diff --git a/charts/pxc-db/Chart.yaml b/charts/pxc-db/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: "1.6.0"
+appVersion: "1.7.0"
 description: A Helm chart for installing Percona XtraDB Cluster Databases using the PXC Operator.
 name: pxc-db
 home: https://www.percona.com/doc/kubernetes-operator-for-pxc/kubernetes.html
-version: 0.1.14
+version: 0.1.15
 maintainers:
   - name: cap1984
     email: [email protected]

diff --git a/charts/pxc-db/README.md b/charts/pxc-db/README.md
@@ -5,9 +5,9 @@ This chart implements Percona XtraDB Cluster deployment in Kubernets via Custom
 
 ## Pre-requisites
 * [PXC operator](https://hub.helm.sh/charts/percona/pxc-operator) running in you K8S cluster
-* Kubernetes 1.11+
+* Kubernetes 1.15+
 * PV support on the underlying infrastructure - only if you are provisioning persistent volume(s).
-* At least `v2.4.0` version of helm to support
+* Helm v3
 
 ## Custom Resource Details
 * <https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/>
@@ -24,7 +24,7 @@ To install the chart with the `pxc` release name using a dedicated namespace (re
 
 ```sh
 helm repo add percona https://percona.github.io/percona-helm-charts/
-helm install my-db percona/pxc-db --version 0.1.10 --namespace my-namespace
+helm install my-db percona/pxc-db --version 0.1.15 --namespace my-namespace
 ```
 
 The chart can be customized using the following configurable parameters:
@@ -39,7 +39,8 @@ The chart can be customized using the following configurable parameters:
 | `upgradeOptions.schedule`          | Cron formatted time to execute the update | `"0 4 * * *"` |
 | `pxc.size`                      | PXC Cluster target member (pod) quantity. Can't even if `allowUnsafeConfigurations` is `true` | `3` |
 | `pxc.image.repository`              | PXC Container image repository                                           | `percona/percona-xtradb-cluster` |
-| `pxc.image.tag`                     | PXC Container image tag                                       | `8.0.20-11.1`                              |
+| `pxc.image.tag`                     | PXC Container image tag                                       | `8.0.21-12.1`                              |
+| `pxc.autoRecovery`                     | Enable full cluster crash auto recovery                    | `true`                              |
 | `pxc.imagePullSecrets`             | PXC Container pull secret                                                | `[]`                                      |
 | `pxc.annotations`             | PXC Pod user-defined annotations                                         | `{}` |
 | `pxc.priorityClassName`       | PXC Pod priority Class defined by user                                   |  |
@@ -67,7 +68,7 @@ The chart can be customized using the following configurable parameters:
 | `haproxy.enabled` | Use HAProxy as TCP proxy for PXC cluster | `true` |
 | `haproxy.size`                      | HAProxy target pod quantity. Can't even if `allowUnsafeConfigurations` is `true` | `3` |
 | `haproxy.image.repository`              | HAProxy Container image repository                                           | `percona/percona-xtradb-cluster-operator` |
-| `haproxy.image.tag`                     | HAProxy Container image tag                                       | `1.6.0-haproxy`                              |
+| `haproxy.image.tag`                     | HAProxy Container image tag                                       | `1.7.0-haproxy`                              |
 | `haproxy.imagePullSecrets`             | HAProxy Container pull secret                                                | `[]`                                      |
 | `haproxy.annotations`             | HAProxy Pod user-defined annotations                                         | `{}` |
 | `haproxy.priorityClassName`       | HAProxy Pod priority Class defined by user                                   |  |
@@ -87,7 +88,7 @@ The chart can be customized using the following configurable parameters:
 | `proxysql.enabled` | Use ProxySQL as TCP proxy for PXC cluster | `false` |
 | `proxysql.size`                      | ProxySQL target pod quantity. Can't even if `allowUnsafeConfigurations` is `true` | `3` |
 | `proxysql.image.repository`              | ProxySQL Container image repository                                           | `percona/percona-xtradb-cluster-operator` |
-| `proxysql.image.tag`                     | ProxySQL Container image tag                                       | `1.6.0-proxysql`                              |
+| `proxysql.image.tag`                     | ProxySQL Container image tag                                       | `1.7.0-proxysql`                              |
 | `proxysql.imagePullSecrets`             | ProxySQL Container pull secret                                                | `[]`                                      |
 | `proxysql.annotations`             | ProxySQL Pod user-defined annotations                                         | `{}` |
 | `proxysql.priorityClassName`       | ProxySQL Pod priority Class defined by user                                   |  |
@@ -109,16 +110,23 @@ The chart can be customized using the following configurable parameters:
 | `proxysql.persistence.accessMode` | Sets K8S persistent storage access policy for all ProxySQL Pods | `ReadWriteOnce`                      |
 | `proxysql.persistence.size` | Sets K8S persistent storage size for all ProxySQL Pods | `8Gi`                      |
 | |
+| `logcollector.enabled` | Enable log collector container | `true` |
+| `logcollector.image.repository`              | Log collector image repository                                           | `percona/percona-xtradb-cluster-operator` |
+| `logcollector.image.tag`                     | Log collector image tag                                       | `1.7.0-logcollector`                              |
+| |
 | `pmm.enabled` | Enable integration with [Percona Monitoting and Management software](https://www.percona.com/doc/kubernetes-operator-for-pxc/monitoring.html) | `false` |
-| `pmm.image.repository`              | PMM Container image repository                                           | `perconalab/pmm-client` |
-| `pmm.image.tag`                     | PMM Container image tag                                       | `1.17.1`                              |
+| `pmm.image.repository`              | PMM Container image repository                                           | `percona/pmm-client` |
+| `pmm.image.tag`                     | PMM Container image tag                                       | `2.12.0`                              |
 | `pmm.serverHost`                      | PMM server related K8S service hostname              | `monitoring-service` |
-| `pmm.serverUser`                      | Username for accessing PXC database internals | `pmm` |
+| `pmm.serverUser`                      | Username for accessing PXC database internals | `admin` |
 | |
 | `backup.enabled` | Enables backups for PXC cluster | `true` |
 | `backup.image.repository`              | Backup Container image repository                                           | `percona/percona-xtradb-cluster-operator` |
-| `backup.image.tag`                     | Backup Container image tag                      | `1.5.0-pxc8.0-backup`                              |
+| `backup.image.tag`                     | Backup Container image tag                      | `1.7.0-pxc8.0-backup`                              |
 | `backup.imagePullSecrets`             | Backup Container pull secret                                                | `[]`                                      |
+| `backup.pitr.enabled`             | Enable point in time recovery                                                | `false`                                      |
+| `backup.pitr.storageName`             | Storage name for PITR                                                | `s3-us-west-binlogs`                                      |
+| `backup.pitr.timeBetweenUploads`             | Time between uploads for PITR                                                | `60`                                      |
 | `backup.storages.fs-pvc` | Backups storage configuration, where `storages:` is a high-level key for the underlying structure. `fs-pvc` is a user-defined storage name. | |
 | `backup.storages.fs-pvc.type`             | Backup storage type                                          | `filysystem` |
 | `backup.storages.fs-pvc.volume.persistentVolumeClaim.accessModes`       | Backup PVC access policy                                   | `["ReadWriteOnce"]` |

diff --git a/charts/pxc-db/crds/crd.yaml b/charts/pxc-db/crds/crd.yaml
@@ -33,6 +33,9 @@ spec:
       storage: false
       served: true
     - name: v1-6-0
+      storage: false
+      served: true
+    - name: v1-7-0
       storage: true
       served: true
     - name: v1alpha1
@@ -158,7 +161,6 @@ spec:
     listKind: PerconaXtraDBBackupList
     plural: perconaxtradbbackups
     singular: perconaxtradbbackup
-    shortNames: []
   scope: Namespaced
   versions:
     - name: v1alpha1

diff --git a/charts/pxc-db/production-values.yaml b/charts/pxc-db/production-values.yaml
@@ -13,19 +13,21 @@ finalizers:
 nameOverride: "production"
 fullnameOverride: "production"
 
+crVersion: 1.7.0
 pause: false
 allowUnsafeConfigurations: false
 updateStrategy: SmartUpdate
 upgradeOptions:
-  versionServiceEndpoint: https://check.percona.com/versions
+  versionServiceEndpoint: https://check.percona.com
   apply: disabled
   schedule: "0 4 * * *"
 
 pxc:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster
-    tag: 8.0.20-11.2
+    tag: 8.0.21-12.1
+  autoRecovery: true
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -97,7 +99,7 @@ haproxy:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.6.0-haproxy
+    tag: 1.7.0-haproxy
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -144,7 +146,7 @@ proxysql:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.6.0-proxysql
+    tag: 1.7.0-proxysql
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -191,28 +193,38 @@ proxysql:
     accessMode: ReadWriteOnce
     size: 8Gi
 
+logcollector:
+  enabled: true
+  image:
+    repository: percona/percona-xtradb-cluster-operator
+    tag: 1.7.0-logcollector
+
 pmm:
   enabled: false
   image:
-    repository: perconalab/pmm-client
-    tag: 1.17.1
+    repository: percona/pmm-client
+    tag: 2.12.0
   serverHost: monitoring-service
-  serverUser: pmm
+  serverUser: admin
 
 backup:
   enabled: true
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.6.0-pxc8.0-backup
+    tag: 1.7.0-pxc8.0-backup
   imagePullSecrets: []
   # - name: private-registry-credentials
+  pitr:
+    enabled: false
+    storageName: s3-us-west-binlogs
+    timeBetweenUploads: 60
   storages:
     fs-pvc:
       type: filesystem
       volume:
         persistentVolumeClaim:
         #  storageClassName: standard
-          accessModes: [ "ReadWriteOnce" ]
+          accessModes: ["ReadWriteOnce"]
           resources:
             requests:
               storage: 6Gi
@@ -224,6 +236,13 @@ backup:
     #     credentialsSecret: my-cluster-name-backup-s3
     #     region: us-west-2
     #     endpointUrl: https://sfo2.digitaloceanspaces.com
+    # s3-us-west-binlogs:
+    #   type: s3
+    #   s3:
+    #     bucket: S3-BACKUP-BUCKET-NAME-HERE/DIRECTORY
+    #     credentialsSecret: my-cluster-name-backup-s3
+    #     region: us-west-2
+    #     endpointUrl: https://sfo2.digitaloceanspaces.com
 
   schedule:
     - name: "daily-backup"

diff --git a/charts/pxc-db/templates/cluster-secret.yaml b/charts/pxc-db/templates/cluster-secret.yaml
@@ -14,4 +14,4 @@ data:
   proxyadmin: {{ .Values.secrets.passwords.proxyadmin | b64enc }}
   pmmserver: {{ .Values.secrets.passwords.pmmserver | b64enc }}
   operator: {{ .Values.secrets.passwords.operator | b64enc }}
-{{- end -}}
+{{- end }}
diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml
@@ -1,9 +1,9 @@
-apiVersion: pxc.percona.com/v1-6-0
+apiVersion: pxc.percona.com/v1-7-0
 kind: PerconaXtraDBCluster
 metadata:
   annotations:
     kubectl.kubernetes.io/last-applied-configuration: |
-      {"apiVersion":"pxc.percona.com/v1-6-0","kind":"PerconaXtraDBCluster"}
+      {"apiVersion":"pxc.percona.com/v1-7-0","kind":"PerconaXtraDBCluster"}
   name: {{ include "pxc-database.fullname" . }}
   labels:
 {{ include "pxc-database.labels" . | indent 4 }}
@@ -28,6 +28,16 @@ spec:
   sslInternalSecretName: {{ include "pxc-database.fullname" . }}-ssl-internal
   {{- end }}
   {{- end }}
+  {{- if hasKey .Values.pxc "vaultSecretName" }}
+  vaultSecretName: {{ .Values.pxc.vaultSecretName }}
+  {{- else }}
+  vaultSecretName: {{ include "pxc-database.fullname" . }}-vault
+  {{- end }}
+  {{- if hasKey .Values.pxc "logCollectorSecretName" }}
+  logCollectorSecretName: {{ .Values.pxc.logCollectorSecretName }}
+  {{- else }}
+  logCollectorSecretName: {{ include "pxc-database.fullname" . }}-log-collector
+  {{- end }}
   {{- if or .Values.allowUnsafeConfigurations .Values.pxc.disableTLS }}
   allowUnsafeConfigurations: true
   {{- end }}
@@ -43,6 +53,7 @@ spec:
   pxc:
     size: {{ $pxc.size }}
     image: "{{ $pxc.image.repository }}:{{ $pxc.image.tag }}"
+    autoRecovery: {{ $pxc.autoRecovery }}
     readinessDelaySec: {{ $pxc.readinessDelaySec }}
     livenessDelaySec: {{ $pxc.livenessDelaySec }}
     forceUnsafeBootstrap: {{ $pxc.forceUnsafeBootstrap }}
@@ -193,6 +204,14 @@ spec:
     {{- end }}
     gracePeriod: {{ $proxysql.gracePeriod }}
   {{- end }}
+  logcollector:
+  {{- if not .Values.logcollector.enabled }}
+    enabled: false
+  {{- else }}
+    {{- $logcollector := .Values.logcollector }}
+    enabled: true
+    image: {{ $logcollector.image.repository }}:{{ $logcollector.image.tag }}
+  {{- end }}
   pmm:
   {{- if not .Values.pmm.enabled }}
     enabled: false
@@ -214,6 +233,14 @@ spec:
     imagePullSecrets:
 {{ $backup.imagePullSecrets | toYaml | indent 6 }}
     {{- end }}
+    pitr:
+    {{- if not $backup.pitr.enabled }}
+      enabled: false
+    {{- else }}
+      enabled: true
+      storageName: {{ $backup.pitr.storageName }}
+      timeBetweenUploads: {{ $backup.pitr.timeBetweenUploads }}
+    {{- end }}
     storages:
 {{ $backup.storages | toYaml | indent 6 }}
     schedule:

diff --git a/charts/pxc-db/values.yaml b/charts/pxc-db/values.yaml
@@ -12,19 +12,21 @@ finalizers:
 nameOverride: ""
 fullnameOverride: ""
 
+crVersion: 1.7.0
 pause: false
 allowUnsafeConfigurations: false
 updateStrategy: SmartUpdate
 upgradeOptions:
-  versionServiceEndpoint: https://check.percona.com/versions
+  versionServiceEndpoint: https://check.percona.com
   apply: recommended
   schedule: "0 4 * * *"
 
 pxc:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster
-    tag: 8.0.20-11.1
+    tag: 8.0.21-12.1
+  autoRecovery: true
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -103,7 +105,7 @@ haproxy:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.6.0-haproxy
+    tag: 1.7.0-haproxy
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -150,7 +152,7 @@ proxysql:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.6.0-proxysql
+    tag: 1.7.0-proxysql
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -207,21 +209,31 @@ proxysql:
     accessMode: ReadWriteOnce
     size: 8Gi
 
+logcollector:
+  enabled: true
+  image:
+    repository: percona/percona-xtradb-cluster-operator
+    tag: 1.7.0-logcollector
+
 pmm:
   enabled: false
   image:
-    repository: perconalab/pmm-client
-    tag: 1.17.1
+    repository: percona/pmm-client
+    tag: 2.12.0
   serverHost: monitoring-service
-  serverUser: pmm
+  serverUser: admin
 
 backup:
   enabled: true
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.6.0-pxc8.0-backup
+    tag: 1.7.0-pxc8.0-backup
   imagePullSecrets: []
   # - name: private-registry-credentials
+  pitr:
+    enabled: false
+    storageName: s3-us-west-binlogs
+    timeBetweenUploads: 60
   storages:
     fs-pvc:
       type: filesystem
@@ -239,6 +251,13 @@ backup:
     #     credentialsSecret: my-cluster-name-backup-s3
     #     region: us-west-2
     #     endpointUrl: https://sfo2.digitaloceanspaces.com
+    # s3-us-west-binlogs:
+    #   type: s3
+    #   s3:
+    #     bucket: S3-BACKUP-BUCKET-NAME-HERE/DIRECTORY
+    #     credentialsSecret: my-cluster-name-backup-s3
+    #     region: us-west-2
+    #     endpointUrl: https://sfo2.digitaloceanspaces.com
 
   schedule:
     - name: "daily-backup"