jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-09 20:57:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent port-level policy from overwriting existing ingress annotation configs (#3118)

Browse Source
This commit is contained in:
澄潭
2025-11-12 20:52:07 +08:00
committed by GitHub
parent 95077a1138
commit 135a6b622f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/ingress/config/ingress_config.go
View File

@@ -857,8 +857,17 @@ func (m *IngressConfig) convertDestinationRule(configs []common.WrapperConfig) [
portUpdated := false portUpdated := false
for _, policy := range dr.DestinationRule.TrafficPolicy.PortLevelSettings { for _, policy := range dr.DestinationRule.TrafficPolicy.PortLevelSettings {
if policy.Port.Number == portTrafficPolicy.Port.Number { if policy.Port.Number == portTrafficPolicy.Port.Number {
policy.Tls = portTrafficPolicy.Tls // Only set Tls if not already configured
policy.LoadBalancer = portTrafficPolicy.LoadBalancer if policy.Tls == nil && portTrafficPolicy.Tls != nil {
policy.Tls = portTrafficPolicy.Tls
}
// Only set LoadBalancer if not already configured
if policy.LoadBalancer == nil && portTrafficPolicy.LoadBalancer != nil {
policy.LoadBalancer = portTrafficPolicy.LoadBalancer
} else if policy.LoadBalancer != nil && policy.LoadBalancer.LbPolicy == nil &&
portTrafficPolicy.LoadBalancer != nil && portTrafficPolicy.LoadBalancer.LbPolicy != nil {
policy.LoadBalancer.LbPolicy = portTrafficPolicy.LoadBalancer.LbPolicy
}
portUpdated = true portUpdated = true
break break
} }