Merge branch 'main' into khewonc/metadata-equality

DataDog · Oct 17, 2024 · d5207f1 · d5207f1
2 parents c93949a + ae4c939
commit d5207f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -2,7 +2,7 @@ resources:
 - manager.yaml
 images:
 - name: controller
-  newName: fannyatdd/operator
-  newTag: saa
+  newName: gcr.io/datadoghq/operator
+  newTag: 1.9.0
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
diff --git a/internal/controller/datadogmonitor/controller.go b/internal/controller/datadogmonitor/controller.go
@@ -94,18 +94,20 @@ func (r *Reconciler) internalReconcile(ctx context.Context, req reconcile.Reques
 	now := metav1.NewTime(time.Now())
 	forceSyncPeriod := defaultForceSyncPeriod
 
-	forceSyncPeriodInt, err := strconv.Atoi(os.Getenv(DDMonitorForceSyncPeriodEnvVar))
-	if err != nil {
-		logger.Error(err, "Invalid value for monitor force sync period. Defaulting to 60 minutes.")
-	} else {
-		logger.V(1).Info("Setting monitor force sync period", "minutes", forceSyncPeriodInt)
-		forceSyncPeriod = time.Duration(forceSyncPeriodInt) * time.Minute
+	if userForceSyncPeriod, ok := os.LookupEnv(DDMonitorForceSyncPeriodEnvVar); ok {
+		forceSyncPeriodInt, err := strconv.Atoi(userForceSyncPeriod)
+		if err != nil {
+			logger.Error(err, "Invalid value for monitor force sync period. Defaulting to 60 minutes.")
+		} else {
+			logger.V(1).Info("Setting monitor force sync period", "minutes", forceSyncPeriodInt)
+			forceSyncPeriod = time.Duration(forceSyncPeriodInt) * time.Minute
+		}
 	}
 
 	// Get instance
 	instance := &datadoghqv1alpha1.DatadogMonitor{}
 	var result ctrl.Result
-	err = r.client.Get(ctx, req.NamespacedName, instance)
+	err := r.client.Get(ctx, req.NamespacedName, instance)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.