cleanup

Author: yerzhan7

.github/workflows/e2e-rosa-tests.yaml

@@ -20,6 +20,8 @@ env:
   BENCHMARK_BUCKET: "s3://${{ vars.BENCHMARK_BUCKET }}"
   TAG_UNTESTED: "untested_${{ inputs.ref }}"
   TAG_PASSED: "test_passed_${{ inputs.ref }}"
+  CLUSTER_TYPE: "openshift"
+  CLUSTER_NAME: "s3-csi-${{ inputs.environment }}"
 jobs:
   build:
     runs-on: ubuntu-22.04 # FIXME - https://github.com/actions/runner-images/issues/11471
@@ -139,7 +141,6 @@ jobs:
           ACTION: "install_driver"
           TAG: "untested_${{ inputs.ref }}"
           CSI_DRIVER_IRSA_ROLE_ARN: "arn:aws:iam::${{ steps.aws-creds.outputs.aws-account-id }}:role/s3-csi-${{ inputs.environment }}-driver-irsa"
-          IS_OPENSHIFT: "true"
         run: |
           tests/e2e-kubernetes/scripts/run.sh
       - name: Run E2E Tests
@@ -155,14 +156,13 @@ jobs:
         run: |
           tests/e2e-kubernetes/scripts/run.sh
       - name: Uninstall the driver
-        if: always()
+        # if: always()
         env:
           ACTION: "uninstall_driver"
-          IS_OPENSHIFT: "true"
         run: |
           tests/e2e-kubernetes/scripts/run.sh
       - name: Delete ROSA cluster
-        if: always()
+        # if: always()
         env:
           TF_VAR_aws_region: "${{ vars.AWS_REGION }}"
           TF_VAR_cluster_name: "s3-csi-${{ inputs.environment }}"

tests/e2e-kubernetes/scripts/helm.sh

@@ -19,10 +19,10 @@ function helm_uninstall_driver() {
   KUBECTL_BIN=${2}
   RELEASE_NAME=${3}
   KUBECONFIG=${4}
-  IS_OPENSHIFT=${5}
+  CLUSTER_TYPE=${5}
 
   if driver_installed ${HELM_BIN} ${RELEASE_NAME} ${KUBECONFIG}; then
-    if [[ "${IS_OPENSHIFT}" == "true" ]]; then
+    if [[ "${CLUSTER_TYPE}" == "openshift" ]]; then
       echo "OpenShift cluster detected - using graceful Helm uninstall as ClusterRoleBindings cannot be deleted due to admission webhooks."
       set +e
       $HELM_BIN uninstall $RELEASE_NAME --namespace kube-system --kubeconfig $KUBECONFIG
@@ -47,14 +47,14 @@ function helm_install_driver() {
   TAG=${5}
   KUBECONFIG=${6}
   CSI_DRIVER_IRSA_ROLE_ARN=${7}
-  IS_OPENSHIFT=${8}
+  CLUSTER_TYPE=${8}
 
   helm_uninstall_driver \
     "$HELM_BIN" \
     "$KUBECTL_BIN" \
     "$RELEASE_NAME" \
     "$KUBECONFIG" \
-    "$IS_OPENSHIFT"
+    "$CLUSTER_TYPE"
 
   if [[ -n "${CSI_DRIVER_IRSA_ROLE_ARN}" ]]; then
     echo "Configuring IRSA for CSI driver with role: ${CSI_DRIVER_IRSA_ROLE_ARN}"

tests/e2e-kubernetes/scripts/run.sh

@@ -32,7 +32,6 @@ IMDS_AVAILABLE=${IMDS_AVAILABLE:-true}
 ARCH=${ARCH:-x86}
 AMI_FAMILY=${AMI_FAMILY:-AmazonLinux2}
 SELINUX_MODE=${SELINUX_MODE:-}
-IS_OPENSHIFT=${IS_OPENSHIFT:-false}
 
 # eksctl: mustn't include patch version (e.g. 1.19)
 # 'K8S_VERSION' variable must be a full version (e.g. 1.19.1)
@@ -41,11 +40,11 @@ K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION%.*}}
 
 # We need to ensure that we're using all testing matrix variables in the cluster name
 # because they all run in parallel and conflicting name would break other tests.
-CLUSTER_NAME="s3-csi-cluster-${CLUSTER_TYPE}-${AMI_FAMILY,,}-${ARCH}"
-
-if [[ "${CLUSTER_TYPE}" == "eksctl" ]]; then
+if [[ "${CLUSTER_TYPE}" == "openshift" ]]; then
+    CLUSTER_NAME=${CLUSTER_NAME:-"s3-csi-rosa"}
+elif [[ "${CLUSTER_TYPE}" == "eksctl" ]]; then
     # EKS does not allow cluster names with ".", we're replacing them with "-".
-    CLUSTER_NAME="${CLUSTER_NAME}-${K8S_VERSION_EKSCTL/./-}"
+    CLUSTER_NAME="s3-csi-cluster-${CLUSTER_TYPE}-${AMI_FAMILY,,}-${ARCH}-${K8S_VERSION_EKSCTL/./-}"
 else
     echo "Unsupported cluster type: ${CLUSTER_TYPE}."
     exit 1
@@ -173,7 +172,7 @@ elif [[ "${ACTION}" == "install_driver" ]]; then
     "${TAG}" \
     "${KUBECONFIG}" \
     "${CSI_DRIVER_IRSA_ROLE_ARN}" \
-    "${IS_OPENSHIFT}"
+    "${CLUSTER_TYPE}"
 elif [[ "${ACTION}" == "run_tests" ]]; then
   set +e
   pushd tests/e2e-kubernetes
@@ -203,7 +202,7 @@ elif [[ "${ACTION}" == "uninstall_driver" ]]; then
     "$KUBECTL_BIN" \
     "$HELM_RELEASE_NAME" \
     "${KUBECONFIG}" \
-    "${IS_OPENSHIFT}"
+    "${CLUSTER_TYPE}"
 elif [[ "${ACTION}" == "delete_cluster" ]]; then
   delete_cluster
 elif [[ "${ACTION}" == "e2e_cleanup" ]]; then