jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-04-21 20:17:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to istio 1.19 (#1211)

Browse Source 
Co-authored-by: CH3CHO <ch3cho@qq.com>
Co-authored-by: rinfx <893383980@qq.com>
This commit is contained in:
澄潭
2024-08-26 09:51:47 +08:00
committed by GitHub
parent a2c2d1d521
commit f7a419770d
401 changed files with 21171 additions and 7255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/ingress/kube/annotations/default_backend_test.go
View File

@@ -21,9 +21,10 @@ import (
"time"
networking "istio.io/api/networking/v1alpha3"
"istio.io/istio/pilot/pkg/model"
"istio.io/istio/pkg/cluster"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
listerv1 "k8s.io/client-go/listers/core/v1"
@@ -64,7 +65,7 @@ func TestFallbackParse(t *testing.T) {
buildNginxAnnotationKey(annDefaultBackend): "test/app",
},
expect: &FallbackConfig{
DefaultBackend: model.NamespacedName{
DefaultBackend: types.NamespacedName{
Namespace: "test",
Name: "app",
},
@@ -76,7 +77,7 @@ func TestFallbackParse(t *testing.T) {
buildHigressAnnotationKey(annDefaultBackend): "app",
},
expect: &FallbackConfig{
DefaultBackend: model.NamespacedName{
DefaultBackend: types.NamespacedName{
Namespace: "test",
Name: "app",
},
@@ -94,7 +95,7 @@ func TestFallbackParse(t *testing.T) {
buildNginxAnnotationKey(customHTTPError): "404,503",
},
expect: &FallbackConfig{
DefaultBackend: model.NamespacedName{
DefaultBackend: types.NamespacedName{
Namespace: "test",
Name: "app",
},
@@ -108,7 +109,7 @@ func TestFallbackParse(t *testing.T) {
buildNginxAnnotationKey(customHTTPError): "404,5ac",
},
expect: &FallbackConfig{
DefaultBackend: model.NamespacedName{
DefaultBackend: types.NamespacedName{
Namespace: "test",
Name: "app",
},
@@ -152,7 +153,7 @@ func TestFallbackApplyRoute(t *testing.T) {
{
config: &Ingress{
Fallback: &FallbackConfig{
DefaultBackend: model.NamespacedName{
DefaultBackend: types.NamespacedName{
Namespace: "test",
Name: "app",
},
@@ -222,7 +223,7 @@ func initGlobalContextForService() (*GlobalContext, context.CancelFunc) {
cache.WaitForCacheSync(ctx.Done(), serviceInformer.Informer().HasSynced)
return &GlobalContext{
ClusterServiceList: map[string]listerv1.ServiceLister{
ClusterServiceList: map[cluster.ID]listerv1.ServiceLister{
"cluster": serviceInformer.Lister(),
},
}, cancel