Parameterize Requeue Time

opendatahub-io · Nov 11, 2023 · d3f0796 · d3f0796
1 parent 95e1ba2
commit d3f0796
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -113,5 +113,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.MAX_CONCURRENT_RECONCILES
+  - name: REQUEUE_TIME
+    objref:
+      kind: ConfigMap
+      name: dspo-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.REQUEUE_TIME
+
 configurations:
   - params.yaml
diff --git a/config/base/params.env b/config/base/params.env
@@ -12,3 +12,4 @@ IMAGES_MARIADB=registry.redhat.io/rhel8/mariadb-103:1
 IMAGES_OAUTHPROXY=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
 ZAP_LOG_LEVEL=info
 MAX_CONCURRENT_RECONCILES=10
+DSPO_REQUEUE_TIME=2m
diff --git a/config/configmaps/files/config.yaml b/config/configmaps/files/config.yaml
@@ -10,3 +10,6 @@ Images:
   MlmdEnvoy: $(IMAGES_MLMDENVOY)
   MlmdGRPC: $(IMAGES_MLMDGRPC)
   MlmdWriter: $(IMAGES_MLMDWRITER)
+DSPO:
+  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
@@ -66,6 +66,7 @@ const (
 	MlmdEnvoyImagePath            = "Images.MlmdEnvoy"
 	MlmdGRPCImagePath             = "Images.MlmdGRPC"
 	MlmdWriterImagePath           = "Images.MlmdWriter"
+	RequeueTimeConfigName         = "DSPO.RequeueTime"
 )
 
 // DSPA Status Condition Types
@@ -112,6 +113,8 @@ const DefaultObjStoreConnectionTimeout = time.Second * 15
 
 const DefaultMaxConcurrentReconciles = 10
 
+const DefaultRequeueTime = 2 * time.Minute
+
 func GetConfigRequiredFields() []string {
 	return requiredFields
 }
@@ -148,3 +151,10 @@ func GetStringConfigWithDefault(configName, value string) string {
 	}
 	return viper.GetString(configName)
 }
+
+func GetDurationConfigWithDefault(configName string, value time.Duration) time.Duration {
+	if !viper.IsSet(configName) {
+		return value
+	}
+	return viper.GetDuration(configName)
+}
diff --git a/controllers/dspipeline_controller.go b/controllers/dspipeline_controller.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"fmt"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
-	"time"
+	// 	"time"
 
 	"github.com/go-logr/logr"
 	mf "github.com/manifestival/manifestival"
@@ -206,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)