Merge pull request #52 from Infisical/feat/fallback-sync

feat: resync interval change for instant updates

Author: akhilmhdh

api/v1alpha1/infisicalsecret_types.go

@@ -176,7 +176,6 @@ type InfisicalSecretSpec struct {
 	// +kubebuilder:validation:Optional
 	ManagedKubeConfigMapReferences []ManagedKubeConfigMapConfig `json:"managedKubeConfigMapReferences"`
 
-	// +kubebuilder:default:=60
 	// +kubebuilder:validation:Optional
 	ResyncInterval int `json:"resyncInterval"`
 
@@ -199,7 +198,6 @@ type InfisicalSecretSyncConfig struct {
 	InstantUpdates bool `json:"instantUpdates"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="60s"
 	ResyncInterval string `json:"resyncInterval"`
 }
 

config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml

@@ -506,14 +506,12 @@ spec:
                 - secretNamespace
                 type: object
               resyncInterval:
-                default: 60
                 type: integer
               syncConfig:
                 properties:
                   instantUpdates:
                     type: boolean
                   resyncInterval:
-                    default: 60s
                     type: string
                 type: object
               tls:

internal/controller/infisicalsecret_controller.go

@@ -40,6 +40,7 @@ import (
 )
 
 const DEFAULT_RESYNC_INTERVAL = time.Minute
+const DEFAULT_RESYNC_INTERVAL_WITH_INSTANT_UPDATES = time.Hour
 
 // InfisicalSecretReconciler reconciles a InfisicalSecret object
 type InfisicalSecretReconciler struct {
@@ -144,19 +145,34 @@ func (r *InfisicalSecretReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 	}
 
-	if duration, err := util.ConvertResyncIntervalToDuration(syncConfig.ResyncInterval, true); err == nil {
-		// successfully parsed the resync interval. if its parsed to 0, we should use the default of 60 seconds
-		if duration != 0 {
-			requeueTime = duration
-			logger.Info(fmt.Sprintf("resync interval set from syncConfig. interval: %v", requeueTime))
+	// Determine the default resync interval based on InstantUpdates setting
+	defaultResyncInterval := DEFAULT_RESYNC_INTERVAL
+	if syncConfig.InstantUpdates {
+		defaultResyncInterval = DEFAULT_RESYNC_INTERVAL_WITH_INSTANT_UPDATES
+	}
+
+	// Check if ResyncInterval was explicitly provided
+	resyncIntervalProvided := syncConfig.ResyncInterval != "" && syncConfig.ResyncInterval != "0s"
+
+	if resyncIntervalProvided {
+		if duration, err := util.ConvertResyncIntervalToDuration(syncConfig.ResyncInterval, true); err == nil {
+			if duration != 0 {
+				requeueTime = duration
+				logger.Info(fmt.Sprintf("resync interval set from syncConfig. interval: %v", requeueTime))
+			} else {
+				// Parsed to 0, use default based on InstantUpdates
+				logger.Info(fmt.Sprintf("resync interval set to 0, using default of %v", defaultResyncInterval))
+				requeueTime = defaultResyncInterval
+			}
 		} else {
-			logger.Info(fmt.Sprintf("resync interval set to 0, using default of %v", DEFAULT_RESYNC_INTERVAL))
-			requeueTime = DEFAULT_RESYNC_INTERVAL
+			// Failed to parse the resync interval
+			logger.Error(err, fmt.Sprintf("failed to parse resync interval from syncConfig, using default of %v. [err=%v]", defaultResyncInterval, err))
+			requeueTime = defaultResyncInterval
 		}
 	} else {
-		// failed to parse the resync interval
-		logger.Error(err, fmt.Sprintf("failed to parse resync interval from syncConfig, using default of %v. [err=%v]", DEFAULT_RESYNC_INTERVAL, err))
-		requeueTime = DEFAULT_RESYNC_INTERVAL
+		// ResyncInterval not provided, use default based on InstantUpdates
+		logger.Info(fmt.Sprintf("resync interval not provided, using default of %v (instantUpdates=%v)", defaultResyncInterval, syncConfig.InstantUpdates))
+		requeueTime = defaultResyncInterval
 	}
 
 	// Check if the resource is already marked for deletion