K8SPS-670 Add Spaces storage support

e2e-tests/run-distro.csv

@@ -1,11 +1,11 @@
 auto-config
 config
 config-router
-demand-backup-minio
-demand-backup-cloud
+demand-backup
+demand-backup-multi-storage
 demand-backup-retry
-gr-demand-backup-minio
-gr-demand-backup-cloud
+gr-demand-backup
+gr-demand-backup-multi-storage
 gr-demand-backup-haproxy
 gr-finalizer
 gr-haproxy

e2e-tests/run-minikube.csv

@@ -1,11 +1,11 @@
 auto-config
 config
 config-router
-demand-backup-minio
-demand-backup-cloud
+demand-backup
+demand-backup-multi-storage
 demand-backup-retry
-gr-demand-backup-minio
-gr-demand-backup-cloud
+gr-demand-backup
+gr-demand-backup-multi-storage
 gr-demand-backup-haproxy
 gr-haproxy
 gr-init-deploy

e2e-tests/run-pr.csv

@@ -6,9 +6,9 @@ auto-config,8.4
 config,8.4
 config-router,8.0
 config-router,8.4
-demand-backup-minio,8.0
-demand-backup-minio,8.4
-demand-backup-cloud,8.4
+demand-backup,8.0
+demand-backup,8.4
+demand-backup-multi-storage,8.4
 demand-backup-retry,8.4
 demand-backup-incremental,8.0
 demand-backup-incremental,8.4
@@ -17,8 +17,8 @@ async-data-at-rest-encryption,8.4
 gr-global-metadata,8.4
 gr-data-at-rest-encryption,8.0
 gr-data-at-rest-encryption,8.4
-gr-demand-backup-minio,8.4
-gr-demand-backup-cloud,8.4
+gr-demand-backup,8.4
+gr-demand-backup-multi-storage,8.4
 gr-demand-backup-haproxy,8.4
 gr-demand-backup-incremental,8.0
 gr-demand-backup-incremental,8.4

e2e-tests/run-release.csv

@@ -4,15 +4,15 @@ async-global-metadata
 auto-config
 config
 config-router
-demand-backup-minio
-demand-backup-cloud
+demand-backup
+demand-backup-multi-storage
 demand-backup-retry
 demand-backup-incremental
 async-data-at-rest-encryption
 gr-global-metadata
 gr-data-at-rest-encryption
-gr-demand-backup-minio
-gr-demand-backup-cloud
+gr-demand-backup
+gr-demand-backup-multi-storage
 gr-demand-backup-haproxy
 gr-demand-backup-incremental
 gr-finalizer

e2e-tests/tests/demand-backup-incremental/00-assert.yaml

@@ -2,8 +2,25 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 150
 ---
-apiVersion: v1
-kind: Secret
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
 metadata:
-  name: minio-secret
-type: Opaque
+  name: perconaservermysqls.ps.percona.com
+spec:
+  group: ps.percona.com
+  names:
+    kind: PerconaServerMySQL
+    listKind: PerconaServerMySQLList
+    plural: perconaservermysqls
+    shortNames:
+    - ps
+    singular: perconaservermysql
+  scope: Namespaced
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+metadata:
+  name: check-operator-deploy-status
+timeout: 120
+commands:
+  - script: kubectl assert exist-enhanced deployment percona-server-mysql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1

e2e-tests/tests/gr-demand-backup-incremental/01-deploy-operator.yaml → e2e-tests/tests/demand-backup-incremental/00-deploy-operator.yaml

@@ -12,5 +12,7 @@ commands:
       deploy_operator
       deploy_tls_cluster_secrets
       deploy_client
-      deploy_minio
+      if has_minio_storage; then
+        deploy_minio
+      fi
     timeout: 300

e2e-tests/tests/demand-backup-incremental/01-assert.yaml

@@ -1,26 +1,60 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 150
+timeout: 600
 ---
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
+kind: StatefulSet
+apiVersion: apps/v1
 metadata:
-  name: perconaservermysqls.ps.percona.com
-spec:
-  group: ps.percona.com
-  names:
-    kind: PerconaServerMySQL
-    listKind: PerconaServerMySQLList
-    plural: perconaservermysqls
-    shortNames:
-    - ps
-    singular: perconaservermysql
-  scope: Namespaced
+  name: demand-backup-incremental-mysql
+status:
+  observedGeneration: 1
+  replicas: 3
+  readyReplicas: 3
+  currentReplicas: 3
+  updatedReplicas: 3
+  collisionCount: 0
 ---
-apiVersion: kuttl.dev/v1beta1
-kind: TestAssert
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: demand-backup-incremental-orc
+status:
+  observedGeneration: 1
+  replicas: 3
+  readyReplicas: 3
+  currentReplicas: 3
+  updatedReplicas: 3
+  collisionCount: 0
+---
+kind: StatefulSet
+apiVersion: apps/v1
+metadata:
+  name: demand-backup-incremental-haproxy
+status:
+  observedGeneration: 1
+  replicas: 3
+  readyReplicas: 3
+  currentReplicas: 3
+  updatedReplicas: 3
+  collisionCount: 0
+---
+apiVersion: ps.percona.com/v1
+kind: PerconaServerMySQL
 metadata:
-  name: check-operator-deploy-status
-timeout: 120
-commands:
-  - script: kubectl assert exist-enhanced deployment percona-server-mysql-operator -n ${OPERATOR_NS:-$NAMESPACE} --field-selector status.readyReplicas=1
+  name: demand-backup-incremental
+  finalizers:
+    - percona.com/delete-mysql-pods-in-order
+status:
+  haproxy:
+    ready: 3
+    size: 3
+    state: ready
+  mysql:
+    ready: 3
+    size: 3
+    state: ready
+  orchestrator:
+    ready: 3
+    size: 3
+    state: ready
+  state: ready

e2e-tests/tests/demand-backup-incremental/01-create-cluster.yaml

@@ -0,0 +1,10 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |-
+      set -o errexit
+      set -o xtrace
+
+      source ../../functions
+
+      get_cr | kubectl -n "${NAMESPACE}" apply -f -