Merge pull request #437 from DharmitD/reque-params

Parameterize Requeue Time
opendatahub-io · Nov 13, 2023 · 45f03e5 · 45f03e5
2 parents ec0ece0 + d190eb7
commit 45f03e5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -127,5 +127,12 @@ 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
 configurations:
   - params.yaml
diff --git a/config/base/params.env b/config/base/params.env
@@ -14,3 +14,4 @@ ZAP_LOG_LEVEL=info
 MAX_CONCURRENT_RECONCILES=10
 DSPO_HEALTHCHECK_DATABASE_CONNECTIONTIMEOUT=15s
 DSPO_HEALTHCHECK_OBJECTSTORE_CONNECTIONTIMEOUT=15s
+DSPO_REQUEUE_TIME=2m
diff --git a/config/configmaps/files/config.yaml b/config/configmaps/files/config.yaml
@@ -16,3 +16,4 @@ DSPO:
       ConnectionTimeout: $(DSPO_HEALTHCHECK_DATABASE_CONNECTIONTIMEOUT)
     ObjectStore:
       ConnectionTimeout: $(DSPO_HEALTHCHECK_OBJECTSTORE_CONNECTIONTIMEOUT)
+  RequeueTime: $(DSPO_REQUEUE_TIME)
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -62,6 +62,8 @@ spec:
             value: $(ZAP_LOG_LEVEL)
           - name: MAX_CONCURRENT_RECONCILES
             value: $(MAX_CONCURRENT_RECONCILES)
+          - name: REQUEUE_TIME
+            value: $(REQUEUE_TIME)
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/controllers/config/defaults.go b/controllers/config/defaults.go
@@ -72,6 +72,7 @@ const (
 	MlmdWriterImagePath                 = "Images.MlmdWriter"
 	ObjStoreConnectionTimeoutConfigName = "DSPO.HealthCheck.ObjectStore.ConnectionTimeout"
 	DBConnectionTimeoutConfigName       = "DSPO.HealthCheck.Database.ConnectionTimeout"
+	RequeueTimeConfigName               = "DSPO.RequeueTime"
 )
 
 // DSPA Status Condition Types
@@ -118,6 +119,8 @@ const DefaultObjStoreConnectionTimeout = time.Second * 15
 
 const DefaultMaxConcurrentReconciles = 10
 
+const DefaultRequeueTime = 2 * time.Minute
+
 func GetConfigRequiredFields() []string {
 	return requiredFields
 }

diff --git a/controllers/dspipeline_controller.go b/controllers/dspipeline_controller.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"time"
 
 	"github.com/go-logr/logr"
 	mf "github.com/manifestival/manifestival"
@@ -207,10 +206,11 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, nil
 	}
 
+	requeueTime := config.GetDurationConfigWithDefault(config.RequeueTimeConfigName, config.DefaultRequeueTime)
 	err = params.ExtractParams(ctx, dspa, r.Client, r.Log)
 	if err != nil {
 		log.Info(fmt.Sprintf("Encountered error when parsing CR: [%s]", err))
-		return ctrl.Result{Requeue: true, RequeueAfter: 2 * time.Minute}, nil
+		return ctrl.Result{Requeue: true, RequeueAfter: requeueTime}, nil
 	}
 
 	err = r.ReconcileDatabase(ctx, dspa, params)