@@ -301,20 +301,31 @@ func (r *Reconciler) updateImageInStatus(esc *operatorv1alpha1.ExternalSecretsCo
301301
302302// argument list for external-secrets deployment resource
303303func updateContainerSpec (deployment * appsv1.Deployment , esc * operatorv1alpha1.ExternalSecretsConfig , image , logLevel string ) {
304- namespace := getOperatingNamespace (esc )
304+ var (
305+ enableClusterStoreArgFmt = "--enable-cluster-store-reconciler=%s"
306+ enableClusterExternalSecretsArgFmt = "--enable-cluster-external-secret-reconciler=%s"
307+ )
308+
305309 args := []string {
306310 "--concurrent=1" ,
307311 "--metrics-addr=:8080" ,
308312 fmt .Sprintf ("--loglevel=%s" , logLevel ),
309313 "--zap-time-encoding=epoch" ,
310314 "--enable-leader-election=true" ,
311- "--enable-cluster-store-reconciler=true" ,
312- "--enable-cluster-external-secret-reconciler=true" ,
313315 "--enable-push-secret-reconciler=true" ,
314316 }
315317
318+ // when spec.appConfig.operatingNamespace is configured, which is for restricting the
319+ // external-secrets custom resource reconcile scope to specified namespace, the reconciliation
320+ // of cluster scoped custom resources must also be disabled.
321+ namespace := getOperatingNamespace (esc )
316322 if namespace != "" {
317- args = append (args , fmt .Sprintf ("--namespace=%s" , namespace ))
323+ args = append (args , fmt .Sprintf ("--namespace=%s" , namespace ),
324+ fmt .Sprintf (enableClusterStoreArgFmt , "false" ),
325+ fmt .Sprintf (enableClusterExternalSecretsArgFmt , "false" ))
326+ } else {
327+ args = append (args , fmt .Sprintf (enableClusterStoreArgFmt , "true" ),
328+ fmt .Sprintf (enableClusterExternalSecretsArgFmt , "true" ))
318329 }
319330
320331 for i , container := range deployment .Spec .Template .Spec .Containers {
0 commit comments