feat: set appProtocol based on target service #2094
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rueian
reviewed
Apr 21, 2024
| for name, port := range ports_int { | ||
| svcPort := corev1.ServicePort{Name: name, Port: port, AppProtocol: &defaultAppProtocol} | ||
| for svc, portInfo := range serviceMapPortInfo { | ||
| svcPort := corev1.ServicePort{Name: svc, Port: portInfo.PortNumber, AppProtocol: &portInfo.Protocol} |
There was a problem hiding this comment.
Is it possible that the &portInfo.Protocol here points to an empty value? I think in that case we should still use the &defaultAppProtocol
| @@ -203,7 +202,7 @@ func BuildServeService(ctx context.Context, rayService rayv1.RayService, rayClus | |||
| ports := []corev1.ServicePort{} | |||
| for name, port := range ports_int { | |||
| if name == utils.ServingPortName { | |||
| svcPort := corev1.ServicePort{Name: name, Port: port} | |||
| svcPort := corev1.ServicePort{Name: name, Port: port.PortNumber} | |||
There was a problem hiding this comment.
Should we set AppProtocol here?
| @@ -369,35 +368,55 @@ func getServicePorts(cluster rayv1.RayCluster) map[string]int32 { | |||
|
|
|||
| // check if metrics port is defined. If not, add default value for it. | |||
| if _, metricsDefined := ports[utils.MetricsPortName]; !metricsDefined { | |||
| ports[utils.MetricsPortName] = utils.DefaultMetricsPort | |||
| ports[utils.MetricsPortName] = portInfo{PortNumber: utils.DefaultMetricsPort} | |||
There was a problem hiding this comment.
Should we set AppProtocol here?
Yapcheekian
force-pushed
the
feat/set-app-protocol
branch
2 times, most recently
from
d886490
to
4b9052f
Compare
rueian
reviewed
Apr 21, 2024
| @@ -42,10 +42,10 @@ func BuildIngressForHeadService(ctx context.Context, cluster rayv1.RayCluster) ( | |||
|
|
|||
| var paths []networkingv1.HTTPIngressPath | |||
| pathType := networkingv1.PathTypeExact | |||
| servicePorts := getServicePorts(cluster) | |||
| serviceMapPortInfo := getServicePorts(cluster) | |||
There was a problem hiding this comment.
serviceMapPortInfo sounds a little wired. How about we keep it as servicePorts?
Comment on lines
70
to
74
| if portInfo.Protocol != "" { | ||
| appProtocol = portInfo.Protocol | ||
| } | ||
|
|
||
| svcPort := corev1.ServicePort{Name: svc, Port: portInfo.PortNumber, AppProtocol: &appProtocol} |
There was a problem hiding this comment.
The corev1.ServicePort has two protocol fields. One is Protocol and the other one is AppProtocol.
To avoid confusion, I think we should rename the portInfo.Protocol to portInfo.AppProtocol here. That is:
Suggested change
| if portInfo.Protocol != "" { | |
| appProtocol = portInfo.Protocol | |
| } | |
| svcPort := corev1.ServicePort{Name: svc, Port: portInfo.PortNumber, AppProtocol: &appProtocol} | |
| if portInfo.Protocol != "" { | |
| appProtocol = portInfo.AppProtocol | |
| } | |
| svcPort := corev1.ServicePort{Name: svc, Port: portInfo.PortNumber, AppProtocol: &appProtocol} |
Yapcheekian
force-pushed
the
feat/set-app-protocol
branch
from
4b9052f
to
7bca49e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why are these changes needed?
#668 always set app protocol to
tcp. This change dynamically adjusts the port protocol based on the target service.Related issue number
#1946
Checks