fix the issues with namespaces for cluster scope

arangodb · Jan 31, 2022 · 6316144 · 6316144
1 parent 7d4fe0a
commit 6316144
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -384,20 +384,25 @@ func newOperatorConfigAndDeps(id, namespace, name string) (operator.Config, oper
 	if err != nil {
 		return operator.Config{}, operator.Dependencies{}, maskAny(fmt.Errorf("Failed to created versioned client: %s", err))
 	}
-	eventRecorder := createRecorder(cliLog, kubecli, name, namespace)
 
 	scope, ok := scope.AsScope(operatorOptions.scope)
 	if !ok {
 		return operator.Config{}, operator.Dependencies{}, maskAny(fmt.Errorf("Scope %s is not known by Operator", operatorOptions.scope))
 	}
 
+	var watchNamespace string
 	if scope.IsCluster() {
-		namespace = metav1.NamespaceAll
+		watchNamespace = metav1.NamespaceAll
+	} else {
+		watchNamespace = namespace
 	}
 
+	eventRecorder := createRecorder(cliLog, kubecli, name, watchNamespace)
+
 	cfg := operator.Config{
 		ID:                          id,
 		Namespace:                   namespace,
+		WatchNamespace:              watchNamespace,
 		PodName:                     name,
 		ServiceAccount:              serviceAccount,
 		OperatorImage:               image,

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -93,6 +93,7 @@ type Operator struct {
 type Config struct {
 	ID                          string
 	Namespace                   string
+	WatchNamespace              string
 	PodName                     string
 	ServiceAccount              string
 	OperatorImage               string

diff --git a/pkg/operator/operator_deployment.go b/pkg/operator/operator_deployment.go
@@ -49,7 +49,7 @@ func (o *Operator) runDeployments(stop <-chan struct{}) {
 		o.log,
 		o.Dependencies.CRCli.DatabaseV1().RESTClient(),
 		deploymentType.ArangoDeploymentResourcePlural,
-		o.Config.Namespace,
+		o.Config.WatchNamespace,
 		&api.ArangoDeployment{},
 		cache.ResourceEventHandlerFuncs{
 			AddFunc:    o.onAddArangoDeployment,

diff --git a/pkg/operator/operator_deployment_relication.go b/pkg/operator/operator_deployment_relication.go
@@ -49,7 +49,7 @@ func (o *Operator) runDeploymentReplications(stop <-chan struct{}) {
 		o.log,
 		o.Dependencies.CRCli.ReplicationV1().RESTClient(),
 		replication2.ArangoDeploymentReplicationResourcePlural,
-		o.Config.Namespace,
+		o.Config.WatchNamespace,
 		&api.ArangoDeploymentReplication{},
 		cache.ResourceEventHandlerFuncs{
 			AddFunc:    o.onAddArangoDeploymentReplication,
@@ -201,7 +201,7 @@ func (o *Operator) handleDeploymentReplicationEvent(event *Event) error {
 // makeDeploymentReplicationConfigAndDeps creates a Config & Dependencies object for a new DeploymentReplication.
 func (o *Operator) makeDeploymentReplicationConfigAndDeps(apiObject *api.ArangoDeploymentReplication) (replication.Config, replication.Dependencies) {
 	cfg := replication.Config{
-		Namespace: o.Config.Namespace,
+		Namespace: o.Config.WatchNamespace,
 	}
 	deps := replication.Dependencies{
 		Log: o.Dependencies.LogService.MustGetLogger(logging.LoggerNameDeploymentReplication).With().