From 9ebaa4defec888579b531fbf66ff07dab55879e4 Mon Sep 17 00:00:00 2001
From: Vlado Djerek <rage.bubblegum@gmail.com>
Date: Mon, 25 Mar 2024 16:20:24 +0100
Subject: [PATCH] Issue 30524 fix (#30725)

* update singlestore operator version

* add remove finalizer from object to k8s access action

---------

Co-authored-by: Vlado Djerek <djerek.vlado6@gmail.com>
---
 .github/actions/setup-k8s-access/action.yml               | 8 +++++++-
 .github/workflows/beam_PerformanceTests_SingleStoreIO.yml | 1 +
 .test-infra/kubernetes/singlestore/sdb-operator.yaml      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-k8s-access/action.yml b/.github/actions/setup-k8s-access/action.yml
index 5248fff429a0e..56758d0fea1aa 100644
--- a/.github/actions/setup-k8s-access/action.yml
+++ b/.github/actions/setup-k8s-access/action.yml
@@ -34,7 +34,10 @@ inputs:
     description: "Zone of the cluster to be created"
     required: true
     default: "us-central1-a"
-
+  remove_finalizer:
+    description: "Remove finalizers from the cluster"
+    required: false
+    default: ""
 
 runs:
   using: composite
@@ -70,4 +73,7 @@ runs:
       main: echo "Post Cleanup"
       post: |
         echo "Post Cleanup"
+        if [ -n "${{ inputs.remove_finalizer }}" ]; then
+          kubectl patch ${{ inputs.remove_finalizer }} -p '[{"op": "remove", "path": "/metadata/finalizers"}]' --type=json
+        fi
         kubectl delete namespace ${{ steps.replace_namespace.outputs.TEST_NAMESPACE }}
diff --git a/.github/workflows/beam_PerformanceTests_SingleStoreIO.yml b/.github/workflows/beam_PerformanceTests_SingleStoreIO.yml
index 0035fe76ee2ca..49e4c40d8ada2 100644
--- a/.github/workflows/beam_PerformanceTests_SingleStoreIO.yml
+++ b/.github/workflows/beam_PerformanceTests_SingleStoreIO.yml
@@ -83,6 +83,7 @@ jobs:
         with:
           cluster_name: io-datastores
           k8s_namespace: ${{ matrix.job_name }}-${{ github.run_id }}
+          remove_finalizer:  memsqlclusters.memsql.com/sdb-cluster
       - name: Install Singlestore operator
         run: | 
           kubectl apply -f ${{github.workspace}}/.test-infra/kubernetes/singlestore/sdb-rbac.yaml
diff --git a/.test-infra/kubernetes/singlestore/sdb-operator.yaml b/.test-infra/kubernetes/singlestore/sdb-operator.yaml
index fc2b2585b24a0..b4a29f681b81b 100644
--- a/.test-infra/kubernetes/singlestore/sdb-operator.yaml
+++ b/.test-infra/kubernetes/singlestore/sdb-operator.yaml
@@ -32,7 +32,7 @@ spec:
       serviceAccountName: sdb-operator
       containers:
         - name: sdb-operator
-          image: singlestore/operator:3.0.98-156a0090
+          image: singlestore/operator:3.246.0-da805c0b
           imagePullPolicy: Always
           args: [
             # Cause the operator to merge rather than replace annotations on services