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 duplicate import (#3582)

Browse Source 
Signed-off-by: LiuXiang <lx1036@126.com>
This commit is contained in:
LiuXiang
2026-03-11 09:42:21 +08:00
committed by GitHub
parent 528e6c9908
commit 65aba909d7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/ingress/translation/translation.go
View File

@@ -17,7 +17,6 @@ package translation
import ( import (
"sync" "sync"
"istio.io/istio/pilot/pkg/model"
istiomodel "istio.io/istio/pilot/pkg/model" istiomodel "istio.io/istio/pilot/pkg/model"
"istio.io/istio/pkg/config" "istio.io/istio/pkg/config"
"istio.io/istio/pkg/config/schema/collection" "istio.io/istio/pkg/config/schema/collection"
@@ -40,8 +39,8 @@ type IngressTranslation struct {
ingressConfig *ingressconfig.IngressConfig ingressConfig *ingressconfig.IngressConfig
kingressConfig *ingressconfig.KIngressConfig kingressConfig *ingressconfig.KIngressConfig
mutex sync.RWMutex mutex sync.RWMutex
higressRouteCache model.IngressRouteCollection higressRouteCache istiomodel.IngressRouteCollection
higressDomainCache model.IngressDomainCollection higressDomainCache istiomodel.IngressDomainCollection
} }
func NewIngressTranslation(localKubeClient kube.Client, xdsUpdater istiomodel.XDSUpdater, namespace string, options common.Options) *IngressTranslation { func NewIngressTranslation(localKubeClient kube.Client, xdsUpdater istiomodel.XDSUpdater, namespace string, options common.Options) *IngressTranslation {
@@ -109,11 +108,11 @@ func (m *IngressTranslation) SetWatchErrorHandler(f func(r *cache.Reflector, err
return nil return nil
} }
func (m *IngressTranslation) GetIngressRoutes() model.IngressRouteCollection { func (m *IngressTranslation) GetIngressRoutes() istiomodel.IngressRouteCollection {
m.mutex.RLock() m.mutex.RLock()
defer m.mutex.RUnlock() defer m.mutex.RUnlock()
ingressRouteCache := m.ingressConfig.GetIngressRoutes() ingressRouteCache := m.ingressConfig.GetIngressRoutes()
m.higressRouteCache = model.IngressRouteCollection{} m.higressRouteCache = istiomodel.IngressRouteCollection{}
m.higressRouteCache.Invalid = append(m.higressRouteCache.Invalid, ingressRouteCache.Invalid...) m.higressRouteCache.Invalid = append(m.higressRouteCache.Invalid, ingressRouteCache.Invalid...)
m.higressRouteCache.Valid = append(m.higressRouteCache.Valid, ingressRouteCache.Valid...) m.higressRouteCache.Valid = append(m.higressRouteCache.Valid, ingressRouteCache.Valid...)
if m.kingressConfig != nil { if m.kingressConfig != nil {
@@ -125,12 +124,12 @@ func (m *IngressTranslation) GetIngressRoutes() model.IngressRouteCollection {
return m.higressRouteCache return m.higressRouteCache
} }
func (m *IngressTranslation) GetIngressDomains() model.IngressDomainCollection { func (m *IngressTranslation) GetIngressDomains() istiomodel.IngressDomainCollection {
m.mutex.RLock() m.mutex.RLock()
defer m.mutex.RUnlock() defer m.mutex.RUnlock()
ingressDomainCache := m.ingressConfig.GetIngressDomains() ingressDomainCache := m.ingressConfig.GetIngressDomains()
m.higressDomainCache = model.IngressDomainCollection{} m.higressDomainCache = istiomodel.IngressDomainCollection{}
m.higressDomainCache.Invalid = append(m.higressDomainCache.Invalid, ingressDomainCache.Invalid...) m.higressDomainCache.Invalid = append(m.higressDomainCache.Invalid, ingressDomainCache.Invalid...)
m.higressDomainCache.Valid = append(m.higressDomainCache.Valid, ingressDomainCache.Valid...) m.higressDomainCache.Valid = append(m.higressDomainCache.Valid, ingressDomainCache.Valid...)
if m.kingressConfig != nil { if m.kingressConfig != nil {