Merge pull request #402 from ShravaniVangur/ci-changes

ci: Minor fixes in CI

Author: subhamkrai

.github/workflows/go-test-config/action.yaml

@@ -178,7 +178,7 @@ runs:
         kubectl -n ${{ inputs.cluster-ns }} delete cephcluster my-cluster --timeout 3s --wait=false
 
         kubectl rook-ceph ${NS_OPT} restore-deleted cephclusters
-        tests/github-action-helper.sh wait_for_crd_to_be_ready ${{ inputs.cluster-ns }}
+        tests/github-action-helper.sh wait_for_ceph_cluster_to_be_ready ${{ inputs.cluster-ns }}
 
     - name: Restore CRD with CRName
       shell: bash --noprofile --norc -eo pipefail -x {0}
@@ -187,7 +187,7 @@ runs:
         kubectl -n ${{ inputs.cluster-ns }} delete cephcluster my-cluster --timeout 3s --wait=false
 
         kubectl rook-ceph ${NS_OPT} restore-deleted cephclusters my-cluster
-        tests/github-action-helper.sh wait_for_crd_to_be_ready ${{ inputs.cluster-ns }}
+        tests/github-action-helper.sh wait_for_ceph_cluster_to_be_ready ${{ inputs.cluster-ns }}
 
     - name: Show Cluster State
       shell: bash --noprofile --norc -eo pipefail -x {0}

tests/github-action-helper.sh

@@ -139,6 +139,16 @@ deploy_csi_driver_rados_namespace() {
   kubectl create -f cephblockpoolradosnamespace_a.yaml
   wait_for_cephblockpoolradosnamespace_ready_state "rook-ceph" "namespace-a" 60
 
+  # Restart the rook-ceph-operator pod to ensure it picks up new resources
+  operator_pod=$(kubectl -n rook-ceph get pods -l app=rook-ceph-operator -o jsonpath='{.items[0].metadata.name}')
+  if [ -n "$operator_pod" ]; then
+    kubectl -n rook-ceph delete pod "$operator_pod"
+    echo "rook-ceph-operator pod $operator_pod deleted. Waiting for it to restart..."
+  else
+    echo "rook-ceph-operator pod not found, skipping restart."
+  fi
+  wait_for_operator_pod_to_be_ready_state rook-ceph
+
   curl https://raw.githubusercontent.com/rook/rook/refs/heads/master/deploy/examples/radosnamespace.yaml -o cephblockpoolradosnamespace_b.yaml
   sed -i "s|blockPoolName: replicapool|blockPoolName: blockpool-rados-ns |g" cephblockpoolradosnamespace_b.yaml
   sed -i "s|name: namespace-a|name: namespace-b |g" cephblockpoolradosnamespace_b.yaml
@@ -251,8 +261,8 @@ wait_for_operator_pod_to_be_ready_state() {
       echo "waiting for the operator to be in ready state"
       sleep 1
     done
+    echo "rook-ceph-operator pod is in ready state!"
 EOF
-  timeout_command_exit_code
 }
 
 wait_for_three_mons() {
@@ -274,7 +284,7 @@ wait_for_deployment_to_be_running() {
   kubectl -n "$namespace" wait deployment "$deployment" --for condition=Available=True --timeout=90s
 }
 
-wait_for_crd_to_be_ready() {
+wait_for_ceph_cluster_to_be_ready() {
   export cluster_ns=$1
   timeout 300 bash <<-'EOF'
     set -x