feat: pass TENANT_ID to Linseed for internal ES and add tenant suffix control#4584
Open
tianfeng92 wants to merge 1 commit intotigera:masterfrom
Open
feat: pass TENANT_ID to Linseed for internal ES and add tenant suffix control#4584tianfeng92 wants to merge 1 commit intotigera:masterfrom
tianfeng92 wants to merge 1 commit intotigera:masterfrom
Conversation
…NANT_SUFFIX_ENABLED Previously LINSEED_EXPECTED_TENANT_ID was only set when external Elasticsearch was configured. Now it is always set when a tenant exists, ensuring tenant isolation via the x-tenant-id header for all indices including the shared calico_policy_activity index. For internal Elasticsearch environments, set ELASTIC_MULTI_INDEX_TENANT_SUFFIX_ENABLED=false so that multi-index routing omits tenant ID from index names, preserving backward compatibility with existing indices that were created without tenant ID in the name. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
rene-dekker
approved these changes
Mar 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
LINSEED_EXPECTED_TENANT_IDwhen a tenant is configured, not just for external Elasticsearch. This ensures tenant isolation via thex-tenant-idheader for all indices including the sharedcalico_policy_activityindex.ELASTIC_MULTI_INDEX_TENANT_SUFFIX_ENABLED=falsefor internal Elasticsearch environments where existing multi-index indices were created without tenant ID in the name.Test plan
ELASTIC_MULTI_INDEX_TENANT_SUFFIX_ENABLEDis NOT setLINSEED_EXPECTED_TENANT_IDandELASTIC_MULTI_INDEX_TENANT_SUFFIX_ENABLED=falseare set🤖 Generated with Claude Code