Skip to content

Commit bdb2058

Browse files
committed
resolve comments
1 parent c5062fb commit bdb2058

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

internal/controller/httproute_controller.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,7 @@ func (r *HTTPRouteReconciler) processHTTPRouteBackendRefs(tctx *provider.Transla
433433
}
434434

435435
if backend.Kind != nil && *backend.Kind != "Service" {
436-
terr = ReasonError{
437-
Reason: string(gatewayv1.RouteReasonInvalidKind),
438-
Message: fmt.Sprintf("invalid kind %s, only Service is supported", *backend.Kind),
439-
}
436+
terr = newInvalidKindError(*backend.Kind)
440437
continue
441438
}
442439

internal/manager/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func Run(ctx context.Context, logger logr.Logger) error {
184184
Resource: "referencegrants",
185185
})
186186
if err != nil {
187-
logger.Error(err, "CRD ReferenceGrants is not installed")
187+
setupLog.Info("CRD ReferenceGrants is not installed", "err", err)
188188
}
189189
controller.SetEnableReferenceGrant(err == nil)
190190

test/conformance/conformance_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var skippedTestsForSSL = []string{
2424
tests.HTTPRouteRedirectPortAndScheme.ShortName,
2525
}
2626

27-
var skippedTestsForTraditionalRoutes []string // TODO: HTTPRoute hostname intersection and listener hostname matching
27+
// TODO: HTTPRoute hostname intersection and listener hostname matching
2828

2929
var gatewaySupportedFeatures = []features.FeatureName{
3030
features.SupportGateway,
@@ -44,7 +44,7 @@ func TestGatewayAPIConformance(t *testing.T) {
4444
opts.CleanupBaseResources = true
4545
opts.GatewayClassName = gatewayClassName
4646
opts.SupportedFeatures = sets.New(gatewaySupportedFeatures...)
47-
opts.SkipTests = append(skippedTestsForSSL, skippedTestsForTraditionalRoutes...)
47+
opts.SkipTests = skippedTestsForSSL
4848
opts.Implementation = conformancev1.Implementation{
4949
Organization: "APISIX",
5050
Project: "apisix-ingress-controller",
@@ -73,6 +73,6 @@ func TestGatewayAPIConformance(t *testing.T) {
7373
if err != nil {
7474
t.Fatalf("failed to marshal the gateway conformance test report: %v", err)
7575
}
76-
// Save report in root of the repository, file name is in .gitignore.
76+
// Save report in the root of the repository, file name is in .gitignore.
7777
require.NoError(t, os.WriteFile("../../"+reportFileName, rawReport, 0o600))
7878
}

0 commit comments

Comments
 (0)