Make Kibana and Alertmanager optional#4567
Open
rene-dekker wants to merge 2 commits intotigera:masterfrom
Open
Make Kibana and Alertmanager optional#4567rene-dekker wants to merge 2 commits intotigera:masterfrom
rene-dekker wants to merge 2 commits intotigera:masterfrom
Conversation
rene-dekker
force-pushed
the
EV-6496
branch
2 times, most recently
from
7765712 to
c1007e0
Compare
Add Replicas *int32 to KibanaSpec and AlertManagerSpec. When set to 0, the component and its resources are not rendered. Kibana defaults to 1, Alertmanager defaults to 0. Both now use their own Replicas field instead of Installation.ControlPlaneReplicas. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
| } | ||
|
|
||
| kibanaEnabled := !r.multiTenant | ||
| if kibanaEnabled && ls.Spec.Kibana != nil && ls.Spec.Kibana.Spec != nil && |
Member
There was a problem hiding this comment.
Might be worth a common helper to avoid duplicating this?
Member
Author
There was a problem hiding this comment.
Done, extracted KibanaEnabled to pkg/controller/logstorage/common/common.go and updated all 3 call sites.
| } | ||
|
|
||
| count := int32(1) | ||
| if k.cfg.Installation.ControlPlaneReplicas != nil { |
Member
There was a problem hiding this comment.
Hmmmm, this is technically a breaking change but maybe we're OK with that?
Member
Author
There was a problem hiding this comment.
Yes, let me update the RN in the description.
The "is Kibana enabled" check was duplicated across the dashboards, elastic, and manager controllers. Move it to a shared exported function in pkg/controller/logstorage/common. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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
4 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
replicasfield toLogStorage.spec.kibana.specandMonitor.spec.alertManager.specReplicasfield instead ofInstallation.ControlPlaneReplicasDesign
https://github.com/tigera/designs/pull/24
To modify Kibana, add this to your Logstorage CR:
To modify Alertmanager, add this to the monitor CR: