Skip to content
Merged
1 change: 1 addition & 0 deletions .github/workflows/conformance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
./get_helm.sh

conformance-test:
timeout-minutes: 60
needs:
- prepare
runs-on: buildjet-2vcpu-ubuntu-2204
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ download-api7ee3-chart:

.PHONY: conformance-test
conformance-test:
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance
DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance -timeout 60m

.PHONY: lint
lint: sort-import golangci-lint ## Run golangci-lint linter
Expand Down
6 changes: 3 additions & 3 deletions api/adc/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ type RewriteConfig struct {
}

type Headers struct {
Set map[string]string `json:"set" yaml:"set"`
Add map[string]string `json:"add" yaml:"add"`
Remove []string `json:"remove" yaml:"remove"`
Set map[string]string `json:"set,omitempty" yaml:"set,omitempty"`
Add map[string]string `json:"add,omitempty" yaml:"add,omitempty"`
Remove []string `json:"remove,omitempty" yaml:"remove,omitempty"`
}

// ResponseRewriteConfig is the rule config for response-rewrite plugin.
Expand Down
33 changes: 12 additions & 21 deletions test/conformance/conformance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,25 @@ var skippedTestsForSSL = []string{

var skippedTestsForTraditionalRoutes = []string{
// TODO: Support ReferenceGrant resource
tests.GatewaySecretInvalidReferenceGrant.ShortName,
Copy link

Copilot AI May 6, 2025

Choose a reason for hiding this comment

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

[nitpick] Review the reordering and removal of skipped test entries for consistency; consider removing commented-out duplicates to improve list clarity.

Copilot uses AI. Check for mistakes.
tests.GatewaySecretMissingReferenceGrant.ShortName,
tests.HTTPRouteInvalidCrossNamespaceBackendRef.ShortName,
tests.HTTPRouteInvalidReferenceGrant.ShortName,
tests.HTTPRoutePartiallyInvalidViaInvalidReferenceGrant.ShortName,
tests.HTTPRouteReferenceGrant.ShortName,
tests.GatewayInvalidTLSConfiguration.ShortName,
tests.GatewaySecretMissingReferenceGrant.ShortName,
/*
tests.GatewayInvalidTLSConfiguration.ShortName,
tests.GatewayModifyListeners.ShortName,
tests.GatewayWithAttachedRoutes.ShortName,
*/
tests.HTTPRouteHTTPSListener.ShortName,
tests.HTTPRouteHeaderMatching.ShortName,

// TODO: HTTPRoute hostname intersection and listener hostname matching
tests.HTTPRouteHostnameIntersection.ShortName,
tests.HTTPRouteListenerHostnameMatching.ShortName,

tests.HTTPRouteMatching.ShortName,
tests.HTTPRouteExactPathMatching.ShortName,
tests.HTTPRouteMatchingAcrossRoutes.ShortName,

tests.GatewayInvalidTLSConfiguration.ShortName,
tests.HTTPRouteInvalidBackendRefUnknownKind.ShortName,
tests.HTTPRouteInvalidNonExistentBackendRef.ShortName,
tests.HTTPRouteInvalidCrossNamespaceParentRef.ShortName,
tests.HTTPRouteInvalidNonExistentBackendRef.ShortName,
tests.HTTPRouteInvalidParentRefNotMatchingSectionName.ShortName,
tests.HTTPRouteRequestHeaderModifier.ShortName,
tests.HTTPRouteWeight.ShortName,
tests.HTTPRouteHostnameIntersection.ShortName,
tests.HTTPRouteListenerHostnameMatching.ShortName,
tests.HTTPRouteMatchingAcrossRoutes.ShortName,
tests.GatewaySecretReferenceGrantSpecific.ShortName,
tests.GatewaySecretInvalidReferenceGrant.ShortName,
tests.GatewaySecretReferenceGrantAllInNamespace.ShortName,
tests.HTTPRouteInvalidCrossNamespaceBackendRef.ShortName,
tests.HTTPRouteInvalidReferenceGrant.ShortName,
}

var gatewaySupportedFeatures = []features.FeatureName{
Expand Down
1 change: 1 addition & 0 deletions test/conformance/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func deleteNamespace(kubectl *k8s.KubectlOptions) {
"gateway-conformance-infra",
"gateway-conformance-web-backend",
"gateway-conformance-app-backend",
"api7ee-conformance-test",
Copy link

Copilot AI May 6, 2025

Choose a reason for hiding this comment

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

Ensure that the addition of the new namespace 'api7ee-conformance-test' is intentional and that the corresponding deletion logic in conformance tests handles it appropriately.

Suggested change
"api7ee-conformance-test",
// "api7ee-conformance-test", // Uncomment if this namespace is intentionally used in the tests.

Copilot uses AI. Check for mistakes.
}

for _, ns := range namespacesToDelete {
Expand Down
Loading