Merge pull request #35 from percona/K8SPXC-400

K8SPXC-400 fix and more updates for PXC 1.6.0 release
percona · Oct 15, 2020 · 1111347 · 1111347
2 parents f8dc2c1 + f2d5935
commit 1111347
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 54 deletions.
diff --git a/charts/pxc-db/Chart.yaml b/charts/pxc-db/Chart.yaml
@@ -9,3 +9,4 @@ maintainers:
     email: [email protected]
   - name: tplavcic
     email: [email protected]
+icon: https://artifacthub.io/image/0b8875cd-6661-4269-9cf6-0fd92d59017b@1x
diff --git a/charts/pxc-db/README.md b/charts/pxc-db/README.md
@@ -83,11 +83,6 @@ The chart can be customized using the following configurable parameters:
 | `haproxy.tolerations`                   | List of node taints to tolerate for HAProxy Pods                       | `[]`                                      |
 | `haproxy.gracePeriod`                   | Allowed time for graceful shutdown                       | `600`                                      |
 | `haproxy.podDisruptionBudget.maxUnavailable` | Instruct Kubernetes about the failed pods allowed quantity           | `1`                                      |
-| `haproxy.persistence.enabled` | Requests a persistent storage (`hostPath` or `storageClass`) from K8S for HAProxy Pods  | `true`                                      |
-| `haproxy.persistence.hostPath` | Sets datadir path on K8S node for all HAProxy Pods. Available only when `pxc.persistence.enabled: true` |                             |
-| `haproxy.persistence.storageClass` | Sets K8S storageClass name for all HAProxy Pods PVC. Available only when `pxc.persistence.enabled: true` | `-`                      |
-| `haproxy.persistence.accessMode` | Sets K8S persistent storage access policy for all HAProxy Pods | `ReadWriteOnce`                      |
-| `haproxy.persistence.size` | Sets K8S persistent storage size for all HAProxy Pods | `8Gi`                      |
 | |
 | `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` |
@@ -109,8 +104,8 @@ The chart can be customized using the following configurable parameters:
 | `proxysql.gracePeriod`                   | Allowed time for graceful shutdown                       | `600`                                      |
 | `proxysql.podDisruptionBudget.maxUnavailable` | Instruct Kubernetes about the failed pods allowed quantity           | `1`                                      |
 | `proxysql.persistence.enabled` | Requests a persistent storage (`hostPath` or `storageClass`) from K8S for ProxySQL Pods  | `true`                                      |
-| `proxysql.persistence.hostPath` | Sets datadir path on K8S node for all ProxySQL Pods. Available only when `pxc.persistence.enabled: true` |                             |
-| `proxysql.persistence.storageClass` | Sets K8S storageClass name for all ProxySQL Pods PVC. Available only when `pxc.persistence.enabled: true` | `-`                      |
+| `proxysql.persistence.hostPath` | Sets datadir path on K8S node for all ProxySQL Pods. Available only when `proxysql.persistence.enabled: true` |                             |
+| `proxysql.persistence.storageClass` | Sets K8S storageClass name for all ProxySQL Pods PVC. Available only when `proxysql.persistence.enabled: true` | `-`                      |
 | `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`                      |
 | |

diff --git a/charts/pxc-db/crds/crd.yaml b/charts/pxc-db/crds/crd.yaml
@@ -15,7 +15,7 @@ spec:
   scope: Namespaced
   versions:
     - name: v1
-      storage: true
+      storage: false
       served: true
     - name: v1-1-0
       storage: false
@@ -32,6 +32,9 @@ spec:
     - name: v1-5-0
       storage: false
       served: true
+    - name: v1-6-0
+      storage: true
+      served: true
     - name: v1alpha1
       storage: false
       served: true

diff --git a/charts/pxc-db/production-values.yaml b/charts/pxc-db/production-values.yaml
@@ -25,7 +25,7 @@ pxc:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster
-    tag: 8.0.19-10.1
+    tag: 8.0.20-11.2
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -97,7 +97,7 @@ haproxy:
   size: 3
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.5.0-haproxy
+    tag: 1.6.0-haproxy
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -138,18 +138,13 @@ haproxy:
   podDisruptionBudget:
     maxUnavailable: 1
     # minAvailable: 0
-  persistence:
-    enabled: true
-    # storageClass: "-"
-    accessMode: ReadWriteOnce
-    size: 8Gi
 
 proxysql:
   enabled: false
   size: 3
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.5.0-proxysql
+    tag: 1.6.0-proxysql
   imagePullSecrets: []
   # - name: private-registry-credentials
   annotations: {}
@@ -208,7 +203,7 @@ backup:
   enabled: true
   image:
     repository: percona/percona-xtradb-cluster-operator
-    tag: 1.5.0-pxc8.0-backup
+    tag: 1.6.0-pxc8.0-backup
   imagePullSecrets: []
   # - name: private-registry-credentials
   storages:

diff --git a/charts/pxc-db/templates/cluster.yaml b/charts/pxc-db/templates/cluster.yaml
@@ -132,28 +132,7 @@ spec:
     podDisruptionBudget:
 {{ $haproxy.podDisruptionBudget | toYaml | indent 6 }}
     volumeSpec:
-    {{- if not $haproxy.persistence.enabled }}
       emptyDir: {}
-    {{- else }}
-    {{- if hasKey $haproxy.persistence "hostPath" }}
-      hostPath:
-        path: {{ $haproxy.persistence.hostPath }}
-        type: Directory
-    {{- else }}
-      persistentVolumeClaim:
-        {{- if $haproxy.persistence.storageClass }}
-        {{- if (eq "-" $haproxy.persistence.storageClass) }}
-        storageClassName: ""
-        {{- else }}
-        storageClassName: "{{ $haproxy.persistence.storageClass }}"
-        {{- end }}
-        {{- end }}
-        accessModes: [{{ $haproxy.persistence.accessMode | quote }}]
-        resources:
-          requests:
-            storage: {{ $haproxy.persistence.size | quote }}
-    {{- end }}
-    {{- end }}
     gracePeriod: {{ $haproxy.gracePeriod }}
   {{- end }}
   {{- if not .Values.proxysql.enabled }}

diff --git a/charts/pxc-db/values.yaml b/charts/pxc-db/values.yaml
@@ -72,7 +72,7 @@ pxc:
     maxUnavailable: 1
     # minAvailable: 0
   persistence:
-    enabled: true
+    enabled: false
     # if persistence is enabled, you can specify a hostPath (not recommended)
     # hostPath: /data/mysql
     # otherwise you can specify values for a storage claim (default)
@@ -144,21 +144,6 @@ haproxy:
   podDisruptionBudget:
     maxUnavailable: 1
     # minAvailable: 0
-  persistence:
-    enabled: true
-    # if persistence is enabled, you can specify a hostPath (not recommended)
-    # hostPath: /data/mysql
-    # otherwise you can specify values for a storage claim (default)
-    ## percona data Persistent Volume Storage Class
-    ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
-    ## If undefined (the default) or set to null, no storageClassName spec is
-    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-    ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
-    accessMode: ReadWriteOnce
-    size: 8Gi
 
 proxysql:
   enabled: false

diff --git a/charts/pxc-operator/Chart.yaml b/charts/pxc-operator/Chart.yaml
@@ -9,3 +9,4 @@ maintainers:
     email: [email protected]
   - name: tplavcic
     email: [email protected]
+icon: https://artifacthub.io/image/0b8875cd-6661-4269-9cf6-0fd92d59017b@1x