feat(propeller): Support multiple namespaces for limit-namespace #5342
+60
−32
Conversation
This file contains 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
MortalHappiness
commented
May 9, 2024
| propellerScope := promutils.NewScope(propellerConfig.GetConfig().MetricsPrefix).NewSubScope("propeller").NewSubScope(propellerCfg.LimitNamespace) | ||
| limitNamespace := "" | ||
| var namespaceConfigs map[string]cache.Config | ||
| propellerScope := promutils.NewScope(propellerConfig.GetConfig().MetricsPrefix).NewSubScope("propeller").NewSubScope(strings.Replace(propellerCfg.LimitNamespace, ",", "-", -1)) |
There was a problem hiding this comment.
The , character is invalid in prometheus. Therefore I replace it with - here.
| propellerScope := promutils.NewScope(cfg.MetricsPrefix).NewSubScope("propeller").NewSubScope(cfg.LimitNamespace) | ||
| limitNamespace := "" | ||
| var namespaceConfigs map[string]cache.Config | ||
| propellerScope := promutils.NewScope(cfg.MetricsPrefix).NewSubScope("propeller").NewSubScope(strings.Replace(cfg.LimitNamespace, ",", "-", -1)) |
There was a problem hiding this comment.
Same as above
Comment on lines
+55
to
+62
| if strings.Contains(g.namespace, ",") { | ||
| namespaces = strings.Split(g.namespace, ",") | ||
| } else { | ||
| namespaces = make([]string, 0) | ||
| for _, n := range namespaceList.Items { | ||
| namespaces = append(namespaces, n.GetName()) | ||
| } | ||
| } |
There was a problem hiding this comment.
Treat all and comma-separated namespaces as the same case. Transform them into a slice of string and then loop over it.
Comment on lines
+103
to
+110
| if strings.Contains(g.namespace, ",") { | ||
| namespaces = strings.Split(g.namespace, ",") | ||
| } else { | ||
| namespaces = make([]string, 0) | ||
| for _, n := range namespaceList.Items { | ||
| namespaces = append(namespaces, n.GetName()) | ||
| } | ||
| } |
There was a problem hiding this comment.
Same as above
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5342 +/- ##
==========================================
- Coverage 60.23% 60.22% -0.01%
==========================================
Files 646 646
Lines 45664 45680 +16
==========================================
+ Hits 27505 27513 +8
- Misses 15569 15573 +4
- Partials 2590 2594 +4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
MortalHappiness
force-pushed
the
feature/#5181-limit-namespace-multiple
branch
from
fcb0598
to
a3e2cfc
Compare
Resolves: flyteorg#5181 Signed-off-by: Chi-Sheng Liu <chishengliu@chishengliu.com>
MortalHappiness
force-pushed
the
feature/#5181-limit-namespace-multiple
branch
from
a3e2cfc
to
217288f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Tracking issue
Resolves: #5181
Why are the changes needed?
The
limit-namespaceconfig only accepts a single namespace. It should accept multiple namespaces instead of only a single namespace.What changes were proposed in this pull request?
To ensure backward compatibility, this PR makes
limit-namespaceoption to be able to accept comma-separated string.How was this patch tested?
Setup process
Screenshots
Check all the applicable boxes
Related PRs
Docs link