Refactor support export Kuttl tests and add README

Author: tjmoore4

testing/kuttl/e2e/support-export/20--create_limitrange_ingress.yaml

@@ -0,0 +1,33 @@
+# create a LimitRange
+apiVersion: v1
+kind: LimitRange
+metadata:
+  name: kuttl-test-limitrange
+spec:
+  limits:
+  - type: PersistentVolumeClaim
+    max:
+      storage: 2Gi
+    min:
+      storage: 500Mi
+
+---
+# create an Ingress
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: kuttl-test-ingress
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /
+spec:
+  ingressClassName: simple-example
+  rules:
+  - http:
+      paths:
+      - path: /testpath
+        pathType: Prefix
+        backend:
+          service:
+            name: test
+            port:
+              number: 80

testing/kuttl/e2e/support-export/20-assert.yaml

@@ -1,65 +1,9 @@
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
+apiVersion: v1
+kind: LimitRange
 metadata:
-  name: kuttl-support-monitoring-cluster
-spec:
-  backups:
-    pgbackrest:
-      repos:
-        - name: repo1
-          volume:
-            volumeClaimSpec:
-              accessModes:
-                - "ReadWriteOnce"
-              resources:
-                requests:
-                  storage: 1Gi
-  instances:
-    - dataVolumeClaimSpec:
-        accessModes:
-        - "ReadWriteOnce"
-        resources:
-          requests:
-            storage: 1Gi
-      replicas: 1
-  postgresVersion: 14
-status:
-  instances:
-    - name: "00"
-      readyReplicas: 1
-      replicas: 1
-      updatedReplicas: 1
-  monitoring: {}
+  name: kuttl-test-limitrange
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: networking.k8s.io/v1
+kind: Ingress
 metadata:
-  name: crunchy-prometheus
-status:
-  availableReplicas: 1
-  observedGeneration: 1
-  readyReplicas: 1
-  replicas: 1
-  updatedReplicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: crunchy-grafana
-status:
-  availableReplicas: 1
-  observedGeneration: 1
-  readyReplicas: 1
-  replicas: 1
-  updatedReplicas: 1
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: crunchy-alertmanager
-status:
-  availableReplicas: 1
-  observedGeneration: 1
-  readyReplicas: 1
-  replicas: 1
-  updatedReplicas: 1
+  name: kuttl-test-ingress

testing/kuttl/e2e/support-export/21--support_export.yaml

@@ -2,42 +2,57 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-- script: kubectl-pgo --namespace $NAMESPACE support export kuttl-support-monitoring-cluster -o .
+- script: kubectl-pgo --namespace $NAMESPACE support export kuttl-support-cluster -o .
 - script: tar -xf ./crunchy_k8s_support_export_*.tar.gz
 - script: |
     #!/bin/bash
 
-    CLEANUP="rm -r ./kuttl-support-monitoring-cluster ./monitoring ./crunchy_k8s_support_export_*.tar.gz"
-    CLUSTER_DIR="./kuttl-support-monitoring-cluster/logs/"
-    MONITORING_DIR="./monitoring/logs/"
+    CLEANUP="rm -r ./kuttl-support-cluster ./crunchy_k8s_support_export_*.tar.gz"
 
-    # check for exporter, prometheus, grafana and alertmanager logs
-    found=$(find ${CLUSTER_DIR} -name "exporter" | wc -l)
-    if [ "${found}" -eq 0 ]; then
-      echo "exporter not found"
+    # LimitRange directory and list file path
+    LR_DIR="./kuttl-support-cluster/limitranges/"
+    LR_LIST="${LR_DIR}list"
+
+    # check for limitrange object name
+    LRO=$(awk 'NR==2 {print $1}' "${LR_LIST}")
+    [[ "${LRO}" == 'kuttl-test-limitrange' ]] || {
+      echo "Expected 'kuttl-test-limitrange' limitrange, got:"
+      echo "${LRO}"
       eval "$CLEANUP"
       exit 1
-    fi
+    }
 
-    found=$(find ${MONITORING_DIR} -name "prometheus" | wc -l)
-    if [ "${found}" -eq 0 ]; then
-      echo "prometheus not found"
+    # check for a .yaml file for the limitrange object
+    LR_FILE="${LR_DIR}kuttl-test-limitrange.yaml"
+    if [ ! -f ${LR_FILE} ]
+    then
+      echo "Expected directory with file, ${LR_FILE}, got:"
+      ls ${LR_DIR}
       eval "$CLEANUP"
       exit 1
     fi
 
-    found=$(find ${MONITORING_DIR} -name "grafana" | wc -l)
-    if [ "${found}" -eq 0 ]; then
-      echo "grafana not found"
+    # Ingress directory and list file path
+    I_DIR="./kuttl-support-cluster/ingresses/"
+    I_LIST="${I_DIR}list"
+
+    # check for ingress object name
+    IO=$(awk 'NR==2 {print $1}' ${I_LIST})
+    [[ "${IO}" == 'kuttl-test-ingress' ]] || {
+      echo "Expected 'kuttl-test-ingress' ingress, got:"
+      echo "${IO}"
       eval "$CLEANUP"
       exit 1
-    fi
+    }
 
-    found=$(find ${MONITORING_DIR} -name "alertmanager" | wc -l)
-    if [ "${found}" -eq 0 ]; then
-      echo "alertmanager not found"
+    # check for a .yaml file for the ingress object
+    I_FILE="${I_DIR}kuttl-test-ingress.yaml"
+    if [ ! -f ${I_FILE} ]
+    then
+      echo "Expected directory with file, ${I_FILE}, got:"
+      ls ${I_DIR}
       eval "$CLEANUP"
       exit 1
     fi
 
-- script: rm -r ./kuttl-support-monitoring-cluster ./monitoring ./crunchy_k8s_support_export_*.tar.gz
+- script: rm -r ./kuttl-support-cluster ./crunchy_k8s_support_export_*.tar.gz

testing/kuttl/e2e/support-export/22--cleanup.yaml

@@ -4,15 +4,9 @@ delete:
 - apiVersion: postgres-operator.crunchydata.com/v1beta1
   kind: PostgresCluster
   name: kuttl-support-cluster
-- apiVersion: postgres-operator.crunchydata.com/v1beta1
-  kind: PostgresCluster
-  name: kuttl-support-monitoring-cluster
-- apiVersion: apps/v1
-  kind: Deployment
-  name: crunchy-prometheus
-- apiVersion: apps/v1
-  kind: Deployment
-  name: crunchy-grafana
-- apiVersion: apps/v1
-  kind: Deployment
-  name: crunchy-alertmanager
+- apiVersion: v1
+  kind: LimitRange
+  name: kuttl-test-limitrange
+- apiVersion: networking.k8s.io/v1
+  kind: Ingress
+  name: kuttl-test-ingress

testing/kuttl/e2e/support-export/22-errors.yaml

@@ -1,25 +1,14 @@
----
 apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
   name: kuttl-support-cluster
 ---
-apiVersion: postgres-operator.crunchydata.com/v1beta1
-kind: PostgresCluster
-metadata:  
-  name: kuttl-support-monitoring-cluster
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: crunchy-prometheus
----
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: v1
+kind: LimitRange
 metadata:
-  name: crunchy-grafana
+  name: kuttl-test-limitrange
 ---
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: networking.k8s.io/v1
+kind: Ingress
 metadata:
-  name: crunchy-alertmanager
+  name: kuttl-test-ingress

…/20--create_cluster_with_monitoring.yaml …/30--create_cluster_with_monitoring.yamltesting/kuttl/e2e/support-export/20--create_cluster_with_monitoring.yaml renamed to testing/kuttl/e2e/support-export/30--create_cluster_with_monitoring.yaml testing/kuttl/e2e/support-export/20--create_cluster_with_monitoring.yaml renamed to testing/kuttl/e2e/support-export/30--create_cluster_with_monitoring.yaml

@@ -1,7 +1,7 @@
 apiVersion: postgres-operator.crunchydata.com/v1beta1
 kind: PostgresCluster
 metadata:
-  name: kuttl-support-cluster-other
+  name: kuttl-support-monitoring-cluster
 spec:
   backups:
     pgbackrest:
@@ -29,13 +29,37 @@ status:
       readyReplicas: 1
       replicas: 1
       updatedReplicas: 1
+  monitoring: {}
 ---
-apiVersion: v1
-kind: LimitRange
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: storagelimits
+  name: crunchy-prometheus
+status:
+  availableReplicas: 1
+  observedGeneration: 1
+  readyReplicas: 1
+  replicas: 1
+  updatedReplicas: 1
 ---
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: minimal-test-ingress
+  name: crunchy-grafana
+status:
+  availableReplicas: 1
+  observedGeneration: 1
+  readyReplicas: 1
+  replicas: 1
+  updatedReplicas: 1
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: crunchy-alertmanager
+status:
+  availableReplicas: 1
+  observedGeneration: 1
+  readyReplicas: 1
+  replicas: 1
+  updatedReplicas: 1