From 76ce5259598750093ec31a4d35b0ac252fbfcca5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Oliveira" <rmartine@redhat.com>
Date: Tue, 26 Mar 2024 10:43:37 -0300
Subject: [PATCH] Remove unnecessary DSPO parameters

Fixes RHOAIENG-4256
---
 config/base/kustomization.yaml | 7 -------
 config/base/params.env         | 1 -
 config/manager/manager.yaml    | 4 ++--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
index 46035a3df..2339b3fb0 100644
--- a/config/base/kustomization.yaml
+++ b/config/base/kustomization.yaml
@@ -136,13 +136,6 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.DSPO_HEALTHCHECK_OBJECTSTORE_CONNECTIONTIMEOUT
-  - name: REQUEUE_TIME
-    objref:
-      kind: ConfigMap
-      name: dspo-parameters
-      apiVersion: v1
-    fieldref:
-      fieldpath: data.DSPO_REQUEUE_TIME
   - name: IMAGESV2_ARGO_APISERVER
     objref:
       kind: ConfigMap
diff --git a/config/base/params.env b/config/base/params.env
index 57a9c4e06..512a67650 100644
--- a/config/base/params.env
+++ b/config/base/params.env
@@ -11,7 +11,6 @@ IMAGESV2_ARGO_PERSISTENCEAGENT=quay.io/opendatahub/ds-pipelines-persistenceagent
 IMAGESV2_ARGO_SCHEDULEDWORKFLOW=quay.io/opendatahub/ds-pipelines-scheduledworkflow:latest
 IMAGESV2_ARGO_MLMDENVOY=registry.redhat.io/openshift-service-mesh/proxyv2-rhel8@sha256:a744c1b386fd5e4f94e43543e829df1bfdd1b564137917372a11da06872f4bcb
 IMAGESV2_ARGO_MLMDGRPC=quay.io/opendatahub/mlmd-grpc-server:latest
-IMAGESV2_ARGO_MLMDWRITER=quay.io/opendatahub/ds-pipelines-metadata-writer:latest
 IMAGESV2_ARGO_WORKFLOWCONTROLLER=quay.io/opendatahub/ds-pipelines-argo-workflowcontroller:3.3.10-upstream
 IMAGESV2_ARGO_ARGOEXEC=quay.io/opendatahub/ds-pipelines-argo-argoexec:3.3.10-upstream
 V2_LAUNCHER_IMAGE=quay.io/opendatahub/ds-pipelines-launcher:latest
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 28efc4649..bae5b4c76 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -81,8 +81,8 @@ spec:
             value: $(ZAP_LOG_LEVEL)
           - name: MAX_CONCURRENT_RECONCILES
             value: $(MAX_CONCURRENT_RECONCILES)
-          - name: REQUEUE_TIME
-            value: $(REQUEUE_TIME)
+          - name: DSPO_REQUEUE_TIME
+            value: $(DSPO_REQUEUE_TIME)
         securityContext:
           allowPrivilegeEscalation: false
           capabilities: