Support for GlobalTrafficPolicy priority processing #249
Conversation
vrushalijoshi
force-pushed
the
Add-priority-to-gtp-processing
branch
from
db4c256
to
6b94a0b
Compare
admiral/cmd/admiral/cmd/root.go
Outdated
| @@ -115,6 +115,8 @@ func GetRootCmd(args []string) *cobra.Command { | |||
| "The label value, on a namespace or service, which tells Istio to perform sidecar injection") | |||
| rootCmd.PersistentFlags().StringVar(¶ms.LabelSet.AdmiralIgnoreLabel, "admiral_ignore_label", "admiral-ignore", | |||
| "The label value, on a namespace, which tells Istio to perform sidecar injection") | |||
| rootCmd.PersistentFlags().StringVar(¶ms.LabelSet.ResourcePriorityKey, "resource_priority_key", "admiral.io/resource-priority", | |||
There was a problem hiding this comment.
Simply call it priority instead of resource priority.
There was a problem hiding this comment.
updated to priority label
| @@ -40,6 +40,7 @@ func init() { | |||
|
|
|||
| p.LabelSet.WorkloadIdentityKey = "identity" | |||
| p.LabelSet.GlobalTrafficDeploymentLabel = "identity" | |||
| p.LabelSet.ResourcePriorityKey = "admiral.io/resource-priority" | |||
There was a problem hiding this comment.
Same suggestion as above.
There was a problem hiding this comment.
updated to priority label
admiral/pkg/clusters/serviceentry.go
Outdated
| @@ -276,6 +290,15 @@ func updateGlobalGtpCache(cache *AdmiralCache, identity, env string, gtps map[st | |||
| } | |||
| } | |||
|
|
|||
| func sortFetchedGtps(gtpsToOrder []*v1.GlobalTrafficPolicy, identity string, env string) { | |||
There was a problem hiding this comment.
| func sortFetchedGtps(gtpsToOrder []*v1.GlobalTrafficPolicy, identity string, env string) { | |
| func sortGtpsByCreationTime(gtpsToOrder []*v1.GlobalTrafficPolicy, identity string, env string) { |
There was a problem hiding this comment.
Updated the method name
| } | ||
| mostRecentGtp = priorityGtpsOrdered[0] | ||
| } | ||
| } |
There was a problem hiding this comment.
Can't we build this into sorting function itself? Sort by priority label present followed by date created?
There was a problem hiding this comment.
Updated the sorting function
admiral/pkg/clusters/serviceentry.go
Outdated
| } | ||
| } else { | ||
| for _, matchedGtp := range gtpsOrdered { | ||
| if matchedGtp.ObjectMeta.Labels[common.GetAdmiralParams().LabelSet.ResourcePriorityKey] == "true" { |
There was a problem hiding this comment.
@vrushalijoshi , just a thought. This would mean that any GTP created by "anyone" with admiral.io/resource-priority: true would be treated as a higher priority.
Do you think it would make sense to have a value that could be passed as a param when the admiral starts and we only look for that value in the label?
There was a problem hiding this comment.
Added fix for priority to value instead of true/false
Signed-off-by: vjoshi3 <vrushali_joshi@intuit.com>
Signed-off-by: vjoshi3 <vrushali_joshi@intuit.com>
Signed-off-by: vjoshi3 <vrushali_joshi@intuit.com>
vrushalijoshi
force-pushed
the
Add-priority-to-gtp-processing
branch
from
8442430
to
78b5e4d
Compare
Adding support to handle GlobalTrafficPolicy with priority label