Merge pull request #500 from tnautiya/custom_rings

Test: add kuttl suite for swift with external rings

Author: openshift-merge-bot[bot]

test/kuttl/tests/custom-rings/00-deps.yaml

@@ -0,0 +1 @@
+../../common/00-deps.yaml

test/kuttl/tests/custom-rings/01-assert-configmap.yaml

@@ -0,0 +1,7 @@
+# This assertion verifies that the swift-ring-files ConfigMap was successfully created
+# by the 01-configmap.yaml step. It only checks for the existence of the ConfigMap resource.
+# The actual validation of ring file contents happens in 02-assert.yaml when checking
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: swift-ring-files

test/kuttl/tests/custom-rings/01-configmap.yaml

@@ -0,0 +1,17 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      # Step 1: Create ConfigMap with compressed ring files
+
+      # Compress ring files
+      mkdir -p /tmp/rings-compressed
+      for ring in ./rings/*.ring; do
+        gzip -c "$ring" > "/tmp/rings-compressed/$(basename $ring).gz"
+      done
+
+      # Create the ConfigMap with compressed ring files
+      oc create configmap swift-ring-files --from-file=/tmp/rings-compressed/ -n $NAMESPACE --dry-run=client -o yaml | oc apply -f -
+
+      # Cleanup temporary compressed files
+      rm -rf /tmp/rings-compressed

test/kuttl/tests/custom-rings/02-assert-deploy-swift.yaml

@@ -0,0 +1,46 @@
+# Assert that the Swift CR is deployed and ready
+apiVersion: swift.openstack.org/v1beta1
+kind: Swift
+metadata:
+  name: swift
+---
+# Verify that the Swift CR is ready and custom ring files are properly deployed
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 600
+commands:
+  - script: |
+      # Wait for Swift CR to be Ready
+      oc wait --for=condition=Ready swift/swift -n $NAMESPACE --timeout=300s
+
+      # Wait for swift-storage-0 pod to be Ready
+      oc wait --for=condition=Ready pod/swift-storage-0 -n $NAMESPACE --timeout=300s
+
+      # Verify the live Swift deployment is using the externally generated object ring
+      echo "Checking object.ring.gz..."
+      if oc exec -n $NAMESPACE swift-storage-0 -c object-server -- zcat /etc/swift/object.ring.gz | grep -q -a "external ring testing"; then
+        echo "object.ring.gz: External ring metadata found"
+      else
+        echo "object.ring.gz: External ring marker NOT found!"
+        exit 1
+      fi
+
+      # Verify account.ring.gz
+      echo "Checking account.ring.gz..."
+      if oc exec -n $NAMESPACE swift-storage-0 -c account-server -- zcat /etc/swift/account.ring.gz | grep -q -a "external ring testing"; then
+        echo "account.ring.gz: External ring metadata found"
+      else
+        echo "account.ring.gz: External ring marker NOT found!"
+        exit 1
+      fi
+
+      # Verify container.ring.gz
+      echo "Checking container.ring.gz..."
+      if oc exec -n $NAMESPACE swift-storage-0 -c container-server -- zcat /etc/swift/container.ring.gz | grep -q -a "external ring testing"; then
+        echo "container.ring.gz: External ring metadata found"
+      else
+        echo "container.ring.gz: External ring marker NOT found!"
+        exit 1
+      fi
+
+      echo "SUCCESS: All custom ring files validated"

test/kuttl/tests/custom-rings/02-deploy-swift.yaml

@@ -0,0 +1,11 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      # Step 2: Deploy Swift application
+
+      # Pull a fresh sample configuration to overlay against
+      cp ../../../../config/samples/swift_v1beta1_swift.yaml deploy/
+
+      # Deploy swift replica, custom-ring environment
+      oc kustomize deploy | oc apply -n $NAMESPACE -f -

test/kuttl/tests/custom-rings/03-cleanup.yaml

@@ -0,0 +1,18 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+delete:
+  - apiVersion: swift.openstack.org/v1beta1
+    kind: Swift
+    name: swift
+commands:
+  - script: |
+      # Delete ConfigMap
+      oc delete configmap swift-ring-files -n $NAMESPACE --ignore-not-found=true
+
+      # Delete PVCs
+      oc delete --ignore-not-found=true -n $NAMESPACE pvc swift-swift-storage-0
+
+      # Clean up Released PVs for reuse
+      for pv in $(oc get pv | grep "Released.*swift" | cut -f 1 -d " "); do
+        oc patch pv $pv -p '{"spec":{"claimRef": null}}'
+      done

test/kuttl/tests/custom-rings/03-errors-cleanup.yaml

@@ -0,0 +1,15 @@
+apiVersion: swift.openstack.org/v1beta1
+kind: Swift
+metadata:
+  name: swift
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    app.kubernetes.io/name: SwiftProxy
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: swift-storage-0

test/kuttl/tests/custom-rings/deploy/kustomization.yaml

@@ -0,0 +1,24 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - swift_v1beta1_swift.yaml
+
+patches:
+  - target:
+      kind: Swift
+      name: swift
+    patch: |-
+      - op: replace
+        path: /spec/swiftProxy/replicas
+        value: 1
+      - op: replace
+        path: /spec/swiftStorage/replicas
+        value: 1
+      - op: replace
+        path: /spec/swiftRing/enabled
+        value: false
+      - op: add
+        path: /spec/ringConfigMaps
+        value:
+          - swift-ring-files