Skip to content

fix flakly ingressnginx test #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2024
Merged

fix flakly ingressnginx test #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61849c1
fix flakly ingressnginx test
LiorLieberman Mar 4, 2024
6bd382c
address feedback
LiorLieberman Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkg/i2gw/providers/ingressnginx/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package ingressnginx
import (
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw"
"github.com/kubernetes-sigs/ingress2gateway/pkg/i2gw/providers/common"
networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
)

Expand All @@ -40,10 +39,7 @@ func newConverter() *converter {
func (c *converter) convert(storage *storage) (i2gw.GatewayResources, field.ErrorList) {

// TODO(liorliberman) temporary until we decide to change ToGateway and featureParsers to get a map of [types.NamespacedName]*networkingv1.Ingress instead of a list
ingressList := []networkingv1.Ingress{}
for _, ing := range storage.Ingresses {
ingressList = append(ingressList, *ing)
}
ingressList := storage.Ingresses.List()

// Convert plain ingress resources to gateway resources, ignoring all
// provider-specific features.
Expand Down
152 changes: 79 additions & 73 deletions pkg/i2gw/providers/ingressnginx/converter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,66 +42,69 @@ func Test_ToGateway(t *testing.T) {

testCases := []struct {
name string
ingresses map[types.NamespacedName]*networkingv1.Ingress
ingresses OrderedIngressMap
expectedGatewayResources i2gw.GatewayResources
expectedErrors field.ErrorList
}{
{
name: "canary deployment",
ingresses: map[types.NamespacedName]*networkingv1.Ingress{
{Namespace: "default", Name: "production"}: {
ObjectMeta: metav1.ObjectMeta{Name: "production", Namespace: "default"},
Spec: networkingv1.IngressSpec{
IngressClassName: ptrTo("ingress-nginx"),
Rules: []networkingv1.IngressRule{{
Host: "echo.prod.mydomain.com",
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{{
Path: "/",
PathType: &iPrefix,
Backend: networkingv1.IngressBackend{
Resource: &corev1.TypedLocalObjectReference{
Name: "production",
Kind: "StorageBucket",
APIGroup: ptrTo("vendor.example.com"),
ingresses: OrderedIngressMap{
ingressNames: []types.NamespacedName{{Namespace: "default", Name: "production"}, {Namespace: "default", Name: "canary"}},
ingressObjects: map[types.NamespacedName]*networkingv1.Ingress{
{Namespace: "default", Name: "production"}: {
ObjectMeta: metav1.ObjectMeta{Name: "production", Namespace: "default"},
Spec: networkingv1.IngressSpec{
IngressClassName: ptrTo("ingress-nginx"),
Rules: []networkingv1.IngressRule{{
Host: "echo.prod.mydomain.com",
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{{
Path: "/",
PathType: &iPrefix,
Backend: networkingv1.IngressBackend{
Resource: &corev1.TypedLocalObjectReference{
Name: "production",
Kind: "StorageBucket",
APIGroup: ptrTo("vendor.example.com"),
},
},
},
}},
}},
},
},
},
}},
},
},
{Namespace: "default", Name: "canary"}: {
ObjectMeta: metav1.ObjectMeta{
Name: "canary",
Namespace: "default",
Annotations: map[string]string{
"nginx.ingress.kubernetes.io/canary": "true",
"nginx.ingress.kubernetes.io/canary-weight": "20",
}},
},
},
Spec: networkingv1.IngressSpec{
IngressClassName: ptrTo("ingress-nginx"),
Rules: []networkingv1.IngressRule{{
Host: "echo.prod.mydomain.com",
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{{
Path: "/",
PathType: &iPrefix,
Backend: networkingv1.IngressBackend{
Resource: &corev1.TypedLocalObjectReference{
Name: "canary",
Kind: "StorageBucket",
APIGroup: ptrTo("vendor.example.com"),
{Namespace: "default", Name: "canary"}: {
ObjectMeta: metav1.ObjectMeta{
Name: "canary",
Namespace: "default",
Annotations: map[string]string{
"nginx.ingress.kubernetes.io/canary": "true",
"nginx.ingress.kubernetes.io/canary-weight": "20",
},
},
Spec: networkingv1.IngressSpec{
IngressClassName: ptrTo("ingress-nginx"),
Rules: []networkingv1.IngressRule{{
Host: "echo.prod.mydomain.com",
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{{
Path: "/",
PathType: &iPrefix,
Backend: networkingv1.IngressBackend{
Resource: &corev1.TypedLocalObjectReference{
Name: "canary",
Kind: "StorageBucket",
APIGroup: ptrTo("vendor.example.com"),
},
},
},
}},
}},
},
},
},
}},
}},
},
},
},
},
Expand Down Expand Up @@ -168,33 +171,36 @@ func Test_ToGateway(t *testing.T) {
},
{
name: "ImplementationSpecific HTTPRouteMatching",
ingresses: map[types.NamespacedName]*networkingv1.Ingress{
{Namespace: "default", Name: "implementation-specific-regex"}: {
ObjectMeta: metav1.ObjectMeta{
Name: "implementation-specific-regex",
Namespace: "default",
},
Spec: networkingv1.IngressSpec{
IngressClassName: ptrTo("ingress-nginx"),
Rules: []networkingv1.IngressRule{{
Host: "test.mydomain.com",
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{{
Path: "/~/echo/**/test",
PathType: &isPathType,
Backend: networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "test",
Port: networkingv1.ServiceBackendPort{
Number: 80,
ingresses: OrderedIngressMap{
ingressNames: []types.NamespacedName{{Namespace: "default", Name: "implementation-specific-regex"}},
ingressObjects: map[types.NamespacedName]*networkingv1.Ingress{
{Namespace: "default", Name: "implementation-specific-regex"}: {
ObjectMeta: metav1.ObjectMeta{
Name: "implementation-specific-regex",
Namespace: "default",
},
Spec: networkingv1.IngressSpec{
IngressClassName: ptrTo("ingress-nginx"),
Rules: []networkingv1.IngressRule{{
Host: "test.mydomain.com",
IngressRuleValue: networkingv1.IngressRuleValue{
HTTP: &networkingv1.HTTPIngressRuleValue{
Paths: []networkingv1.HTTPIngressPath{{
Path: "/~/echo/**/test",
PathType: &isPathType,
Backend: networkingv1.IngressBackend{
Service: &networkingv1.IngressServiceBackend{
Name: "test",
Port: networkingv1.ServiceBackendPort{
Number: 80,
},
},
},
},
}},
}},
},
},
},
}},
}},
},
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/i2gw/providers/ingressnginx/resource_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (r *resourceReader) readResourcesFromCluster(ctx context.Context) (*storage
if err != nil {
return nil, err
}
storage.Ingresses = ingresses
storage.Ingresses.FromMap(ingresses)
return storage, nil
}

Expand All @@ -53,6 +53,6 @@ func (r *resourceReader) readResourcesFromFile(filename string) (*storage, error
if err != nil {
return nil, err
}
storage.Ingresses = ingresses
storage.Ingresses.FromMap(ingresses)
return storage, nil
}
33 changes: 31 additions & 2 deletions pkg/i2gw/providers/ingressnginx/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,45 @@ limitations under the License.
package ingressnginx

import (
"sort"

networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/types"
)

type OrderedIngressMap struct {
ingressNames []types.NamespacedName
ingressObjects map[types.NamespacedName]*networkingv1.Ingress
}
type storage struct {
Ingresses map[types.NamespacedName]*networkingv1.Ingress
Ingresses OrderedIngressMap
}

func newResourcesStorage() *storage {
return &storage{
Ingresses: map[types.NamespacedName]*networkingv1.Ingress{},
Ingresses: OrderedIngressMap{
ingressNames: []types.NamespacedName{},
ingressObjects: map[types.NamespacedName]*networkingv1.Ingress{},
},
}
}

func (oim *OrderedIngressMap) List() []networkingv1.Ingress {
ingressList := []networkingv1.Ingress{}
for _, ing := range oim.ingressNames {
ingressList = append(ingressList, *oim.ingressObjects[ing])
}
return ingressList
}

func (oim *OrderedIngressMap) FromMap(ingresses map[types.NamespacedName]*networkingv1.Ingress) {
ingNames := []types.NamespacedName{}
for ing := range ingresses {
ingNames = append(ingNames, ing)
}
sort.Slice(ingNames, func(i, j int) bool {
return ingNames[i].Name < ingNames[j].Name
})
oim.ingressNames = ingNames
oim.ingressObjects = ingresses
}