Skip to content

Fix HTTPRoute section name related bugs #568

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 3 commits into from
Apr 13, 2023
Merged

Fix HTTPRoute section name related bugs #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b134179
Fix section name related bugs
pleshakov Apr 10, 2023
e0a11a0
Improve unit test
pleshakov Apr 13, 2023
6687043
Merge branch 'main' into fix/sectionnames-cols
pleshakov Apr 13, 2023
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
126 changes: 82 additions & 44 deletions internal/state/change_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,18 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: append(
conditions.NewDefaultRouteConditions(),
conditions.NewTODO("GatewayClass is invalid or doesn't exist"),
),
},
"listener-443-1": {
{
GatewayNsName: client.ObjectKeyFromObject(gw1),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: append(
conditions.NewDefaultRouteConditions(),
conditions.NewTODO("GatewayClass is invalid or doesn't exist"),
Expand Down Expand Up @@ -440,12 +444,16 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw1),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down Expand Up @@ -549,12 +557,16 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1Updated.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw1),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down Expand Up @@ -659,12 +671,16 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1Updated.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down Expand Up @@ -768,12 +784,16 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1Updated.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down Expand Up @@ -880,12 +900,16 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1Updated.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down Expand Up @@ -981,25 +1005,33 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-1"}: {
ObservedGeneration: hr1Updated.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw1Updated),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
{Namespace: "test", Name: "hr-2"}: {
ObservedGeneration: hr2.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw2),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: append(
conditions.NewDefaultRouteConditions(),
conditions.NewTODO("Gateway is ignored"),
),
},
"listener-443-1": {
{
GatewayNsName: client.ObjectKeyFromObject(gw2),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: append(
conditions.NewDefaultRouteConditions(),
conditions.NewTODO("Gateway is ignored"),
Expand Down Expand Up @@ -1098,12 +1130,16 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
{Namespace: "test", Name: "hr-2"}: {
ObservedGeneration: hr2.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: client.ObjectKeyFromObject(gw2),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
"listener-443-1": {
Conditions: conditions.NewDefaultRouteConditions(),
{
GatewayNsName: client.ObjectKeyFromObject(gw2),
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-443-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down Expand Up @@ -2102,9 +2138,11 @@ var _ = Describe("ChangeProcessor", func() {
HTTPRouteStatuses: map[types.NamespacedName]state.HTTPRouteStatus{
hrNsName: {
ObservedGeneration: hr.Generation,
ParentStatuses: map[string]state.ParentStatus{
"listener-80-1": {
Conditions: conditions.NewDefaultRouteConditions(),
ParentStatuses: []state.ParentStatus{
{
GatewayNsName: gwNsName,
SectionName: helpers.GetPointer[v1beta1.SectionName]("listener-80-1"),
Conditions: conditions.NewDefaultRouteConditions(),
},
},
},
Expand Down
66 changes: 33 additions & 33 deletions internal/state/graph/backend_refs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,11 @@ func TestAddBackendGroupsToRouteTest(t *testing.T) {
return rules
}

const sectionName = "test"
sectionNameRefs := map[string]ParentRef{
sectionName: {
Idx: 0,
Gateway: types.NamespacedName{Namespace: "test", Name: "gateway"},
sectionNameRefs := []ParentRef{
{
Idx: 0,
Gateway: types.NamespacedName{Namespace: "test", Name: "gateway"},
Attached: true,
},
}

Expand All @@ -337,10 +337,10 @@ func TestAddBackendGroupsToRouteTest(t *testing.T) {
}{
{
route: &Route{
Source: hrWithOneBackend,
SectionNameRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithOneBackend, allValid, allValid),
Source: hrWithOneBackend,
ParentRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithOneBackend, allValid, allValid),
},
expectedBackendGroups: []BackendGroup{
{
Expand All @@ -362,10 +362,10 @@ func TestAddBackendGroupsToRouteTest(t *testing.T) {
},
{
route: &Route{
Source: hrWithTwoBackends,
SectionNameRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithTwoBackends, allValid, allValid),
Source: hrWithTwoBackends,
ParentRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithTwoBackends, allValid, allValid),
},
expectedBackendGroups: []BackendGroup{
{
Expand Down Expand Up @@ -394,42 +394,42 @@ func TestAddBackendGroupsToRouteTest(t *testing.T) {
},
{
route: &Route{
Source: hrWithOneBackend,
SectionNameRefs: sectionNameRefs,
Valid: false,
Source: hrWithOneBackend,
ParentRefs: sectionNameRefs,
Valid: false,
},
expectedBackendGroups: nil,
expectedConditions: nil,
name: "invalid route",
},
{
route: &Route{
Source: hrWithOneBackend,
SectionNameRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithOneBackend, allInvalid, allValid),
Source: hrWithOneBackend,
ParentRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithOneBackend, allInvalid, allValid),
},
expectedBackendGroups: nil,
expectedConditions: nil,
name: "invalid matches",
},
{
route: &Route{
Source: hrWithOneBackend,
SectionNameRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithOneBackend, allValid, allInvalid),
Source: hrWithOneBackend,
ParentRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithOneBackend, allValid, allInvalid),
},
expectedBackendGroups: nil,
expectedConditions: nil,
name: "invalid filters",
},
{
route: &Route{
Source: hrWithInvalidRule,
SectionNameRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithInvalidRule, allValid, allValid),
Source: hrWithInvalidRule,
ParentRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithInvalidRule, allValid, allValid),
},
expectedBackendGroups: []BackendGroup{
{
Expand All @@ -451,10 +451,10 @@ func TestAddBackendGroupsToRouteTest(t *testing.T) {
},
{
route: &Route{
Source: hrWithZeroBackendRefs,
SectionNameRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithZeroBackendRefs, allValid, allValid),
Source: hrWithZeroBackendRefs,
ParentRefs: sectionNameRefs,
Valid: true,
Rules: createRules(hrWithZeroBackendRefs, allValid, allValid),
},
expectedBackendGroups: []BackendGroup{
{
Expand All @@ -474,7 +474,7 @@ func TestAddBackendGroupsToRouteTest(t *testing.T) {
addBackendGroupsToRoute(test.route, services)

g.Expect(helpers.Diff(test.expectedBackendGroups, test.route.GetAllBackendGroups())).To(BeEmpty())
g.Expect(test.route.GetAllConditionsForSectionName(sectionName)).To(Equal(test.expectedConditions))
g.Expect(test.route.Conditions).To(Equal(test.expectedConditions))
})
}
}
Expand Down
25 changes: 12 additions & 13 deletions internal/state/graph/graph_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"sigs.k8s.io/gateway-api/apis/v1beta1"

"github.com/nginxinc/nginx-kubernetes-gateway/internal/helpers"
"github.com/nginxinc/nginx-kubernetes-gateway/internal/state/conditions"
"github.com/nginxinc/nginx-kubernetes-gateway/internal/state/secrets/secretsfakes"
"github.com/nginxinc/nginx-kubernetes-gateway/internal/state/validation"
"github.com/nginxinc/nginx-kubernetes-gateway/internal/state/validation/validationfakes"
Expand Down Expand Up @@ -179,27 +178,27 @@ func TestBuildGraph(t *testing.T) {
routeHR1 := &Route{
Valid: true,
Source: hr1,
SectionNameRefs: map[string]ParentRef{
"listener-80-1": {
Idx: 0,
Gateway: client.ObjectKeyFromObject(gw1),
ParentRefs: []ParentRef{
{
Idx: 0,
Gateway: client.ObjectKeyFromObject(gw1),
Attached: true,
},
},
UnattachedSectionNameRefs: map[string]conditions.Condition{},
Rules: []Rule{createValidRuleWithBackendGroup(hr1Group)},
Rules: []Rule{createValidRuleWithBackendGroup(hr1Group)},
}

routeHR3 := &Route{
Valid: true,
Source: hr3,
SectionNameRefs: map[string]ParentRef{
"listener-443-1": {
Idx: 0,
Gateway: client.ObjectKeyFromObject(gw1),
ParentRefs: []ParentRef{
{
Idx: 0,
Gateway: client.ObjectKeyFromObject(gw1),
Attached: true,
},
},
UnattachedSectionNameRefs: map[string]conditions.Condition{},
Rules: []Rule{createValidRuleWithBackendGroup(hr3Group)},
Rules: []Rule{createValidRuleWithBackendGroup(hr3Group)},
}

secretMemoryMgr := &secretsfakes.FakeSecretDiskMemoryManager{}
Expand Down
Loading