From b4b1c5d71702927aec80407ea2554787626d79ba Mon Sep 17 00:00:00 2001
From: xiami <xiami@amazon.com>
Date: Tue, 25 May 2021 12:04:57 -0700
Subject: [PATCH] Remove the OTLP receiver legacy gRPC port(55680) references

---
 pkg/collector/parser/receiver_otlp.go      | 10 ++--------
 pkg/collector/parser/receiver_otlp_test.go |  5 ++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkg/collector/parser/receiver_otlp.go b/pkg/collector/parser/receiver_otlp.go
index 292df6862c..5e46ac345e 100644
--- a/pkg/collector/parser/receiver_otlp.go
+++ b/pkg/collector/parser/receiver_otlp.go
@@ -27,9 +27,8 @@ var _ ReceiverParser = &OTLPReceiverParser{}
 const (
 	parserNameOTLP = "__otlp"
 
-	defaultOTLPGRPCPort       int32 = 4317
-	defaultOTLPGRPCLegacyPort int32 = 55680
-	defaultOTLPHTTPPort       int32 = 55681
+	defaultOTLPGRPCPort int32 = 4317
+	defaultOTLPHTTPPort int32 = 55681
 )
 
 // OTLPReceiverParser parses the configuration for OTLP receivers.
@@ -71,11 +70,6 @@ func (o *OTLPReceiverParser) Ports() ([]corev1.ServicePort, error) {
 					Port:       defaultOTLPGRPCPort,
 					TargetPort: intstr.FromInt(int(defaultOTLPGRPCPort)),
 				},
-				{
-					Name:       portName(fmt.Sprintf("%s-grpc-legacy", o.name), defaultOTLPGRPCLegacyPort),
-					Port:       defaultOTLPGRPCLegacyPort,
-					TargetPort: intstr.FromInt(int(defaultOTLPGRPCPort)), // we target the official port, not the legacy
-				},
 			},
 		},
 		{
diff --git a/pkg/collector/parser/receiver_otlp_test.go b/pkg/collector/parser/receiver_otlp_test.go
index c5132060ec..51ca014d28 100644
--- a/pkg/collector/parser/receiver_otlp_test.go
+++ b/pkg/collector/parser/receiver_otlp_test.go
@@ -64,8 +64,7 @@ func TestOTLPExposeDefaultPorts(t *testing.T) {
 		portNumber int32
 		seen       bool
 	}{
-		"otlp-grpc":        {portNumber: 4317},
-		"otlp-grpc-legacy": {portNumber: 55680},
+		"otlp-grpc": {portNumber: 4317},
 	}
 
 	// test
@@ -73,7 +72,7 @@ func TestOTLPExposeDefaultPorts(t *testing.T) {
 
 	// verify
 	assert.NoError(t, err)
-	assert.Len(t, ports, 2)
+	assert.Len(t, ports, 1)
 
 	for _, port := range ports {
 		r := expectedResults[port.Name]