use endpoint name as container port name and service port name #128
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,7 +97,7 @@ func TestConvertEnvs(t *testing.T) { | |
| } | ||
|
|
||
| func TestConvertPorts(t *testing.T) { | ||
| endpointsNames := []string{"endpoint1", "endpoint2", "a-very-long-port-name-before-endpoint-length-limit-8080"} | ||
| endpointsPorts := []int{8080, 9090} | ||
| tests := []struct { | ||
| name string | ||
|
|
@@ -114,7 +114,23 @@ func TestConvertPorts(t *testing.T) { | |
| }, | ||
| want: []corev1.ContainerPort{ | ||
| { | ||
| Name: endpointsNames[0], | ||
| ContainerPort: int32(endpointsPorts[0]), | ||
| Protocol: "TCP", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "One Endpoint with >15 chars length", | ||
| endpoints: []v1.Endpoint{ | ||
| { | ||
| Name: endpointsNames[2], | ||
| TargetPort: endpointsPorts[0], | ||
| }, | ||
| }, | ||
| want: []corev1.ContainerPort{ | ||
| { | ||
| Name: "port-8080", | ||
| ContainerPort: int32(endpointsPorts[0]), | ||
| Protocol: "TCP", | ||
| }, | ||
|
|
@@ -134,12 +150,12 @@ func TestConvertPorts(t *testing.T) { | |
| }, | ||
| want: []corev1.ContainerPort{ | ||
| { | ||
| Name: endpointsNames[0], | ||
| ContainerPort: int32(endpointsPorts[0]), | ||
| Protocol: "TCP", | ||
| }, | ||
| { | ||
| Name: endpointsNames[1], | ||
| ContainerPort: int32(endpointsPorts[1]), | ||
| Protocol: "TCP", | ||
| }, | ||
|
|
@@ -652,7 +668,7 @@ func TestGetPodTemplateSpec(t *testing.T) { | |
|
|
||
| func TestGetServiceSpec(t *testing.T) { | ||
|
|
||
| endpointNames := []string{"port-8080-url", "port-9090-url", "a-very-long-port-name-before-endpoint-length-limit-8080"} | ||
|
|
||
| tests := []struct { | ||
| name string | ||
|
|
@@ -663,7 +679,7 @@ func TestGetServiceSpec(t *testing.T) { | |
| wantPorts []corev1.ServicePort | ||
| }{ | ||
| { | ||
| name: "multiple endpoints have different ports", | ||
|
There was a problem hiding this comment. This test should cover most of our scenarios since we have validation on unique ports but should we handle the exception case as well where There was a problem hiding this comment. we do not specifially do tests for |
||
| containerComponents: []v1.Component{ | ||
| { | ||
| Name: "testcontainer1", | ||
|
|
@@ -676,37 +692,40 @@ func TestGetServiceSpec(t *testing.T) { | |
| }, | ||
| { | ||
| Name: endpointNames[1], | ||
| TargetPort: 9090, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| labels: map[string]string{ | ||
| "component": "testcomponent", | ||
| }, | ||
| wantPorts: []corev1.ServicePort{ | ||
| { | ||
| Name: endpointNames[0], | ||
| Port: 8080, | ||
| TargetPort: intstr.FromInt(8080), | ||
| }, | ||
| { | ||
| Name: endpointNames[1], | ||
| Port: 9090, | ||
| TargetPort: intstr.FromInt(9090), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "long port name before endpoint length limit to <=15", | ||
| containerComponents: []v1.Component{ | ||
| { | ||
| Name: "testcontainer1", | ||
| ComponentUnion: v1.ComponentUnion{ | ||
| Container: &v1.ContainerComponent{ | ||
| Endpoints: []v1.Endpoint{ | ||
| { | ||
| Name: endpointNames[2], | ||
| TargetPort: 8080, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -722,11 +741,6 @@ func TestGetServiceSpec(t *testing.T) { | |
| Port: 8080, | ||
| TargetPort: intstr.FromInt(8080), | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
|
|
@@ -755,7 +769,7 @@ func TestGetServiceSpec(t *testing.T) { | |
| Container: &v1.ContainerComponent{ | ||
| Endpoints: []v1.Endpoint{ | ||
| { | ||
| Name: endpointNames[1], | ||
| TargetPort: 9090, | ||
| }, | ||
| }, | ||
|
|
@@ -768,7 +782,7 @@ func TestGetServiceSpec(t *testing.T) { | |
| }, | ||
| wantPorts: []corev1.ServicePort{ | ||
| { | ||
| Name: endpointNames[1], | ||
| Port: 9090, | ||
| TargetPort: intstr.FromInt(9090), | ||
| }, | ||
|
|
@@ -784,7 +798,7 @@ func TestGetServiceSpec(t *testing.T) { | |
| Container: &v1.ContainerComponent{ | ||
| Endpoints: []v1.Endpoint{ | ||
| { | ||
| Name: endpointNames[1], | ||
| TargetPort: 9090, | ||
| }, | ||
| }, | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are changing a user provided name underneath the covers if length exceeds 15 characters. It'll be good to warn them of these changes ahead of time (via cmd line, log, and/or doc)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. This change is because we want to unify the service port name & the container port name. since service port does not accept starting with a number (has to be alphabet), thus we use the convention
port-<number>@valaparthvi FYI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the warning need to happen on the
odoside?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
correct