ronething commented on code in PR #2601:
URL:
https://github.com/apache/apisix-ingress-controller/pull/2601#discussion_r2430903509
##########
internal/adc/translator/apisixroute.go:
##########
@@ -352,50 +355,57 @@ func (t *Translator) translateApisixRouteHTTPBackend(tctx
*provider.TranslateCon
upstream = u
}
var (
- err error
- nodes adc.UpstreamNodes
+ err error
+ nodes adc.UpstreamNodes
+ protocol string
)
if backend.ResolveGranularity == apiv2.ResolveGranularityService {
- nodes, err =
t.translateApisixRouteBackendResolveGranularityService(tctx, auNN, backend)
+ nodes, protocol, err =
t.translateApisixRouteBackendResolveGranularityService(tctx, auNN, backend)
} else {
- nodes, err =
t.translateApisixRouteBackendResolveGranularityEndpoint(tctx, auNN, backend)
+ nodes, protocol, err =
t.translateApisixRouteBackendResolveGranularityEndpoint(tctx, auNN, backend)
}
if err != nil {
return nil, err
}
upstream.Nodes = nodes
+ if upstream.Scheme == "" {
+ upstream.Scheme = appProtocolToUpstreamScheme(protocol)
+ }
+ if protocol == internaltypes.AppProtocolWS || protocol ==
internaltypes.AppProtocolWSS {
+ *enableWebsocket = ptr.To(true)
+ }
if backend.Weight != nil {
upstream.Labels["meta_weight"] =
strconv.FormatInt(int64(*backend.Weight), 10)
}
return upstream, nil
}
-func (t *Translator) translateApisixRouteBackendResolveGranularityService(tctx
*provider.TranslateContext, arNN types.NamespacedName, backend
apiv2.ApisixRouteHTTPBackend) (adc.UpstreamNodes, error) {
+func (t *Translator) translateApisixRouteBackendResolveGranularityService(tctx
*provider.TranslateContext, arNN types.NamespacedName, backend
apiv2.ApisixRouteHTTPBackend) (adc.UpstreamNodes, string, error) {
Review Comment:
It seems that this function does not actually process the `protocol` and
always returns an empty string?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
