chore: rename related configuration flags to enable-multi-tenancy.

Author: JoseSzycho

cmd/search/indexer/command.go

@@ -48,7 +48,7 @@ type ResourceIndexerOptions struct {
 	BatchMaxConcurrentUploads int
 
 	// Multi-tenancy settings.
-	MultiTenant bool
+	EnableMultiTenancy bool
 }
 
 // NewResourceIndexerOptions creates a new ResourceIndexerOptions with default values.
@@ -68,7 +68,7 @@ func NewResourceIndexerOptions() *ResourceIndexerOptions {
 		MeilisearchMaxRetries:      3,
 		MeilisearchRetryDelay:      500 * time.Millisecond,
 		BatchMaxConcurrentUploads:  100,
-		MultiTenant:                false,
+		EnableMultiTenancy:         false,
 	}
 }
 
@@ -95,7 +95,7 @@ func (o *ResourceIndexerOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.IntVar(&o.BatchMaxConcurrentUploads, "batch-max-concurrent-uploads", o.BatchMaxConcurrentUploads, "The maximum number of concurrent uploads to Meilisearch.")
 
 	// Multi-tenancy
-	fs.BoolVar(&o.MultiTenant, "multi-tenant", o.MultiTenant, "Enable multi-tenant mode to index resources from all project control planes.")
+	fs.BoolVar(&o.EnableMultiTenancy, "enable-multi-tenancy", o.EnableMultiTenancy, "Enable multi-tenant mode to index resources from all project control planes.")
 }
 
 // Validate checks if the resource indexer options are valid.
@@ -302,7 +302,7 @@ func Run(o *ResourceIndexerOptions, ctx context.Context) error {
 	auditBatcher.Start(ctx)
 	reindexBatcher.Start(ctx)
 
-	auditIdx := indexer.NewIndexer(auditConsumer, indexPolicyCache, auditBatcher, o.MultiTenant)
+	auditIdx := indexer.NewIndexer(auditConsumer, indexPolicyCache, auditBatcher, o.EnableMultiTenancy)
 	reindexIdx := indexer.NewReindexConsumer(reindexJSConsumer, reindexPolicyCache, reindexBatcher)
 
 	klog.Info("Starting audit indexer and re-index consumer...")

cmd/search/manager/command.go

@@ -63,7 +63,7 @@ type ControllerManagerOptions struct {
 	NatsTLSKey         string
 
 	// Multi-tenancy settings.
-	MultiTenant          bool
+	EnableMultiTenancy   bool
 	ProjectLabelSelector string
 }
 
@@ -83,7 +83,7 @@ func NewControllerManagerOptions() *ControllerManagerOptions {
 		MeilisearchDomain:          "http://meilisearch.meilisearch-system.svc.cluster.local:7700",
 		NatsURL:                    "nats://nats.nats-system.svc.cluster.local:4222",
 		NatsReindexSubject:         "reindex.all",
-		MultiTenant:                false,
+		EnableMultiTenancy:         false,
 	}
 }
 
@@ -116,7 +116,7 @@ func (o *ControllerManagerOptions) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&o.NatsTLSKey, "nats-tls-key", o.NatsTLSKey, "The path to the NATS TLS key file.")
 
 	// Multi-tenancy
-	fs.BoolVar(&o.MultiTenant, "multi-tenant", o.MultiTenant, "Enable multi-tenant mode to index resources from all project control planes.")
+	fs.BoolVar(&o.EnableMultiTenancy, "enable-multi-tenancy", o.EnableMultiTenancy, "Enable multi-tenant mode to index resources from all project control planes.")
 	fs.StringVar(&o.ProjectLabelSelector, "project-label-selector", o.ProjectLabelSelector, "Label selector to filter which projects are indexed (empty = all projects).")
 }
 
@@ -256,7 +256,7 @@ func Run(o *ControllerManagerOptions, ctx context.Context) error {
 
 	// Build TenantRegistry based on deployment mode.
 	var registry tenant.TenantRegistry
-	if o.MultiTenant {
+	if o.EnableMultiTenancy {
 		// Create a PolicyCache backed by the manager's shared informer cache.
 		// requireReadyCondition=true ensures the ProjectWatcher only bootstraps
 		// policies that are fully initialised (index created, attributes synced).

config/base/controller-manager/deployment.yaml

@@ -48,7 +48,7 @@ spec:
         - --nats-tls-cert=$(NATS_TLS_CERT)
         - --nats-tls-key=$(NATS_TLS_KEY)
         - --leader-elect-resource-namespace=$(LEADER_ELECT_RESOURCE_NAMESPACE)
-        - --multi-tenant=$(MULTI_TENANT)
+        - --enable-multi-tenancy=$(ENABLE_MULTI_TENANCY)
         - --project-label-selector=$(PROJECT_LABEL_SELECTOR)
         env:
         - name: POD_NAMESPACE
@@ -79,7 +79,7 @@ spec:
           value: ""
         - name: LEADER_ELECT_RESOURCE_NAMESPACE
           value: ""
-        - name: MULTI_TENANT
+        - name: ENABLE_MULTI_TENANCY
           value: "false"
         - name: PROJECT_LABEL_SELECTOR
           value: ""

config/base/resource-indexer/deployment.yaml

@@ -28,7 +28,7 @@ spec:
         - --nats-tls-cert=$(NATS_TLS_CERT)
         - --nats-tls-key=$(NATS_TLS_KEY)
         - --meilisearch-domain=$(MEILISEARCH_DOMAIN)
-        - --multi-tenant=$(MULTI_TENANT)
+        - --enable-multi-tenancy=$(ENABLE_MULTI_TENANCY)
         env:
         - name: NATS_URL
           value: "nats://nats.nats-system.svc.cluster.local:4222"
@@ -48,7 +48,7 @@ spec:
           value: "AUDIT_EVENTS"
         - name: MEILISEARCH_DOMAIN
           value: "http://meilisearch.meilisearch-system.svc.cluster.local:7700"
-        - name: MULTI_TENANT
+        - name: ENABLE_MULTI_TENANCY
           value: "false"
         - name: MEILISEARCH_API_KEY
           valueFrom:

config/overlays/controller-manager/core-control-plane/patches/deployment.yaml

@@ -10,7 +10,7 @@ spec:
       containers:
       - name: manager
         env:
-        - name: MULTI_TENANT
+        - name: ENABLE_MULTI_TENANCY
           value: "true"
         - name: PROJECT_LABEL_SELECTOR
           value: ""

config/overlays/resource-indexer/core-control-plane/patches/deployment.yaml

@@ -10,5 +10,5 @@ spec:
       containers:
       - name: indexer
         env:
-        - name: MULTI_TENANT
+        - name: ENABLE_MULTI_TENANCY
           value: "true"

internal/indexer/consumer.go

@@ -13,11 +13,11 @@ import (
 
 // Indexer is the component responsible for indexing resources.
 type Indexer struct {
-	consumer    jetstream.Consumer
-	policyCache *PolicyCache
-	batcher     *Batcher
-	multiTenant bool
-	mu          sync.Mutex
+	consumer           jetstream.Consumer
+	policyCache        *PolicyCache
+	batcher            *Batcher
+	enableMultiTenancy bool
+	mu                 sync.Mutex
 }
 
 type auditEvent struct {
@@ -62,10 +62,10 @@ func extractTenantFromAuditEvent(event *auditEvent) (tenantName string, tenantTy
 // NewIndexer creates a new Indexer instance.
 func NewIndexer(consumer jetstream.Consumer, policyCache *PolicyCache, batcher *Batcher, multiTenant bool) *Indexer {
 	return &Indexer{
-		consumer:    consumer,
-		policyCache: policyCache,
-		batcher:     batcher,
-		multiTenant: multiTenant,
+		consumer:           consumer,
+		policyCache:        policyCache,
+		batcher:            batcher,
+		enableMultiTenancy: multiTenant,
 	}
 }
 
@@ -137,7 +137,7 @@ func (i *Indexer) Start(ctx context.Context) error {
 		// In single-tenant mode, skip non-platform
 		// events entirely so that no policy can accidentally queue them.
 		tenantName, tenantType := extractTenantFromAuditEvent(&event)
-		if !i.multiTenant && tenantType != tenantTypePlatform {
+		if !i.enableMultiTenancy && tenantType != tenantTypePlatform {
 			msg.Ack()
 			return
 		}