From cce94c68e05b2df5d2c027634a93f3be817a259f Mon Sep 17 00:00:00 2001 From: samir-tahir Date: Fri, 22 Mar 2024 14:09:15 +0000 Subject: [PATCH 1/4] up --- internal/controller/secretsync_controller.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/secretsync_controller.go b/internal/controller/secretsync_controller.go index 59b1cda..f1b5acc 100644 --- a/internal/controller/secretsync_controller.go +++ b/internal/controller/secretsync_controller.go @@ -326,7 +326,6 @@ func (r *SecretSyncReconciler) SetupWithManager(mgr ctrl.Manager) error { Watches( &corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(r.findObjectsForSecret), - builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}), builder.WithPredicates(sourceNamespacePredicate()), ). Complete(r) From 84a2642c53a6c8a9075a9478d3868957208c8da2 Mon Sep 17 00:00:00 2001 From: samir-tahir Date: Fri, 22 Mar 2024 14:11:58 +0000 Subject: [PATCH 2/4] up --- internal/controller/secretsync_controller.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/controller/secretsync_controller.go b/internal/controller/secretsync_controller.go index f1b5acc..895ad87 100644 --- a/internal/controller/secretsync_controller.go +++ b/internal/controller/secretsync_controller.go @@ -18,7 +18,7 @@ package controller import ( "context" - "os" + //"os" "reflect" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -301,11 +301,12 @@ func sourceNamespacePredicate() predicate.Predicate { func (r *SecretSyncReconciler) SetupWithManager(mgr ctrl.Manager) error { // Read the source namespace from environment variable - sourceNamespace = os.Getenv("SOURCE_NAMESPACE") - if sourceNamespace == "" { + sourceNamespace = "default" + //sourceNamespace = os.Getenv("SOURCE_NAMESPACE") + //if sourceNamespace == "" { // Handle case where environment variable is not set - panic("SOURCE_NAMESPACE environment variable not set") - } + // panic("SOURCE_NAMESPACE environment variable not set") + //} /* The `spec.secrets` field must be indexed by the manager, so that we will be able to lookup `SecretSyncs` by a referenced `Secret` name. From 60374545eee587ef80bd42fd19a1c58b6e19c2ae Mon Sep 17 00:00:00 2001 From: samir-tahir Date: Fri, 22 Mar 2024 14:23:21 +0000 Subject: [PATCH 3/4] up --- internal/controller/secretsync_controller.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/controller/secretsync_controller.go b/internal/controller/secretsync_controller.go index 895ad87..505d4d5 100644 --- a/internal/controller/secretsync_controller.go +++ b/internal/controller/secretsync_controller.go @@ -328,6 +328,7 @@ func (r *SecretSyncReconciler) SetupWithManager(mgr ctrl.Manager) error { &corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(r.findObjectsForSecret), builder.WithPredicates(sourceNamespacePredicate()), + //builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}), ). Complete(r) } From 8f6d6a5991eed1f17ab0040ee8d90c5b58e4da34 Mon Sep 17 00:00:00 2001 From: samir-tahir Date: Fri, 22 Mar 2024 14:28:12 +0000 Subject: [PATCH 4/4] up --- internal/controller/secretsync_controller.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/internal/controller/secretsync_controller.go b/internal/controller/secretsync_controller.go index 505d4d5..f1b5acc 100644 --- a/internal/controller/secretsync_controller.go +++ b/internal/controller/secretsync_controller.go @@ -18,7 +18,7 @@ package controller import ( "context" - //"os" + "os" "reflect" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -301,12 +301,11 @@ func sourceNamespacePredicate() predicate.Predicate { func (r *SecretSyncReconciler) SetupWithManager(mgr ctrl.Manager) error { // Read the source namespace from environment variable - sourceNamespace = "default" - //sourceNamespace = os.Getenv("SOURCE_NAMESPACE") - //if sourceNamespace == "" { + sourceNamespace = os.Getenv("SOURCE_NAMESPACE") + if sourceNamespace == "" { // Handle case where environment variable is not set - // panic("SOURCE_NAMESPACE environment variable not set") - //} + panic("SOURCE_NAMESPACE environment variable not set") + } /* The `spec.secrets` field must be indexed by the manager, so that we will be able to lookup `SecretSyncs` by a referenced `Secret` name. @@ -328,7 +327,6 @@ func (r *SecretSyncReconciler) SetupWithManager(mgr ctrl.Manager) error { &corev1.Secret{}, handler.EnqueueRequestsFromMapFunc(r.findObjectsForSecret), builder.WithPredicates(sourceNamespacePredicate()), - //builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}), ). Complete(r) }