Skip to content
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

Jump to bottom

fix: reuse gc name in GatewayClassObservedGenerationBump conformance #1645

Closed
wants to merge 1 commit into from
Closed

fix: reuse gc name in GatewayClassObservedGenerationBump conformance #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conformance/tests/gatewayclass-observed-generation-bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: gateway.networking.k8s.io/v1beta1
kind: GatewayClass
metadata:
name: gatewayclass-observed-generation-bump
name: "{GATEWAY_CLASS_NAME}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some previous context here: #1586 (comment). There was also more discussion in the community meeting around that time.

I had 2 main concerns:

  1. I didn't want to allow an existing resource to be mutated by conformance tests
  2. I also wasn't convinced that every implementation would be able to support changes to arbitrary GatewayClasses

Making this change would go against 1 thought it would help with 2.

Eventually we agreed that these could be added if they were guarded by a feature gate and not part of the default test suite. @dprotaso can likely add some more context here as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @robscott! I think EG should support the multiple-GC model, and it makes sence : )

Copy link
Contributor

@dprotaso dprotaso Jan 16, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this test purposely mutates a second gateway class to test the observed generation is bumped in the status conditions when it is reconciled.

I believe changing the name to the default name GATEWAY_CLASS_NAME will (may?) break other tests since it's clearing params etc.

spec:
controllerName: "{GATEWAY_CONTROLLER_NAME}"
description: "old"
3 changes: 3 additions & 0 deletions conformance/utils/kubernetes/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ func (a Applier) prepareGateway(t *testing.T, uObj *unstructured.Unstructured, p
func (a Applier) prepareGatewayClass(t *testing.T, uObj *unstructured.Unstructured) {
err := unstructured.SetNestedField(uObj.Object, a.ControllerName, "spec", "controllerName")
require.NoErrorf(t, err, "error setting `spec.controllerName` on %s GatewayClass resource", uObj.GetName())

err = unstructured.SetNestedField(uObj.Object, a.GatewayClass, "metadata", "name")
require.NoErrorf(t, err, "error setting `metadata.name` on %s GatewayClass resource", uObj.GetName())
}

// prepareNamespace adjusts the Namespace labels.
Expand Down
6 changes: 3 additions & 3 deletions conformance/utils/kubernetes/apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@ spec:
},
}},
}, {
name: "setting the controllerName for a GatewayClass",
name: "setting the controllerName/gatewayClassName for a GatewayClass",
applier: Applier{},
given: `
apiVersion: gateway.networking.k8s.io/v1beta1
kind: GatewayClass
metadata:
name: test
name: {GATEWAY_CLASS_NAME}
spec:
controllerName: {GATEWAY_CONTROLLER_NAME}
`,
Expand All @@ -275,7 +275,7 @@ spec:
"apiVersion": "gateway.networking.k8s.io/v1beta1",
"kind": "GatewayClass",
"metadata": map[string]interface{}{
"name": "test",
"name": "test-class",
},
"spec": map[string]interface{}{
"controllerName": "test-controller",
Expand Down