| false | +|||
| hostPort | +integer | +
+ Allows defining which port to bind to the host in the Container. + + Format: int32 + |
+ false |
| name | string | diff --git a/internal/manifests/collector/adapters/config_to_ports.go b/internal/manifests/collector/adapters/config_to_ports.go index 5f2a88be9c..3a0bc5a6fd 100644 --- a/internal/manifests/collector/adapters/config_to_ports.go +++ b/internal/manifests/collector/adapters/config_to_ports.go @@ -25,6 +25,7 @@ import ( "github.com/mitchellh/mapstructure" corev1 "k8s.io/api/core/v1" + "github.com/open-telemetry/opentelemetry-operator/apis/v1beta1" "github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector/parser" exporterParser "github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector/parser/exporter" receiverParser "github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector/parser/receiver" @@ -43,7 +44,7 @@ func (c ComponentType) String() string { } // ConfigToComponentPorts converts the incoming configuration object into a set of service ports required by the exporters. -func ConfigToComponentPorts(logger logr.Logger, cType ComponentType, config map[interface{}]interface{}) ([]corev1.ServicePort, error) { +func ConfigToComponentPorts(logger logr.Logger, cType ComponentType, config map[interface{}]interface{}) ([]v1beta1.PortsSpec, error) { // now, we gather which ports we might need to open // for that, we get all the exporters and check their `endpoint` properties, // extracting the port from it. The port name has to be a "DNS_LABEL", so, we try to make it follow the pattern: @@ -119,10 +120,17 @@ func ConfigToComponentPorts(logger logr.Logger, cType ComponentType, config map[ return ports[i].Name < ports[j].Name }) - return ports, nil + patchedPorts := []v1beta1.PortsSpec{} + for _, p := range ports { + patchedPorts = append(patchedPorts, v1beta1.PortsSpec{ + ServicePort: p, + }) + } + + return patchedPorts, nil } -func ConfigToPorts(logger logr.Logger, config map[interface{}]interface{}) ([]corev1.ServicePort, error) { +func ConfigToPorts(logger logr.Logger, config map[interface{}]interface{}) ([]v1beta1.PortsSpec, error) { ports, err := ConfigToComponentPorts(logger, ComponentTypeReceiver, config) if err != nil { logger.Error(err, "there was a problem while getting the ports from the receivers") diff --git a/internal/manifests/collector/adapters/config_to_ports_test.go b/internal/manifests/collector/adapters/config_to_ports_test.go index 7c872606f6..d76091379c 100644 --- a/internal/manifests/collector/adapters/config_to_ports_test.go +++ b/internal/manifests/collector/adapters/config_to_ports_test.go @@ -95,6 +95,11 @@ func TestExtractPortsFromConfig(t *testing.T) { targetPort4317 := intstr.IntOrString{Type: 0, IntVal: 4317, StrVal: ""} targetPort4318 := intstr.IntOrString{Type: 0, IntVal: 4318, StrVal: ""} + svcPorts := []corev1.ServicePort{} + for _, p := range ports { + svcPorts = append(svcPorts, p.ServicePort) + } + expectedPorts := []corev1.ServicePort{ {Name: "examplereceiver", Port: 12345}, {Name: "port-12346", Port: 12346}, @@ -107,7 +112,7 @@ func TestExtractPortsFromConfig(t *testing.T) { {Name: "otlp-http", AppProtocol: &httpAppProtocol, Port: 4318, TargetPort: targetPort4318}, {Name: "zipkin", AppProtocol: &httpAppProtocol, Protocol: "TCP", Port: 9411}, } - assert.ElementsMatch(t, expectedPorts, ports) + assert.ElementsMatch(t, expectedPorts, svcPorts) } func TestNoPortsParsed(t *testing.T) { diff --git a/internal/manifests/collector/container.go b/internal/manifests/collector/container.go index fdfc004db8..1ffd81cbe0 100644 --- a/internal/manifests/collector/container.go +++ b/internal/manifests/collector/container.go @@ -59,6 +59,7 @@ func Container(cfg config.Config, logger logr.Logger, otelcol v1beta1.OpenTeleme Name: p.Name, ContainerPort: p.Port, Protocol: p.Protocol, + HostPort: p.HostPort, } } diff --git a/internal/manifests/collector/container_test.go b/internal/manifests/collector/container_test.go index 5dfe16be69..e2cd24639d 100644 --- a/internal/manifests/collector/container_test.go +++ b/internal/manifests/collector/container_test.go @@ -55,11 +55,13 @@ func TestContainerNewDefault(t *testing.T) { otelcol := v1beta1.OpenTelemetryCollector{ Spec: v1beta1.OpenTelemetryCollectorSpec{ OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Ports: []corev1.ServicePort{ + Ports: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, }, }, @@ -109,17 +111,19 @@ service: tests := []struct { description string specConfig string - specPorts []corev1.ServicePort + specPorts []v1beta1.PortsSpec expectedPorts []corev1.ContainerPort }{ { description: "couldn't build ports from spec config", specConfig: "", - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, }, expectedPorts: []corev1.ContainerPort{metricContainerPort}, @@ -138,15 +142,19 @@ service: }, { description: "ports in spec ContainerPorts", - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, { - Name: "testport1", - Port: 12345, + ServicePort: corev1.ServicePort{ + Name: "testport1", + Port: 12345, + }, }, }, expectedPorts: []corev1.ContainerPort{ @@ -160,15 +168,19 @@ service: { description: "ports in spec Config and ContainerPorts", specConfig: goodConfig, - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "testport1", - Port: 12345, + ServicePort: corev1.ServicePort{ + Name: "testport1", + Port: 12345, + }, }, { - Name: "testport2", - Port: 54321, - Protocol: corev1.ProtocolUDP, + ServicePort: corev1.ServicePort{ + Name: "testport2", + Port: 54321, + Protocol: corev1.ProtocolUDP, + }, }, }, expectedPorts: []corev1.ContainerPort{ @@ -191,14 +203,18 @@ service: { description: "duplicate port name", specConfig: goodConfig, - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "testport1", - Port: 12345, + ServicePort: corev1.ServicePort{ + Name: "testport1", + Port: 12345, + }, }, { - Name: "testport1", - Port: 11111, + ServicePort: corev1.ServicePort{ + Name: "testport1", + Port: 11111, + }, }, }, expectedPorts: []corev1.ContainerPort{ @@ -225,15 +241,19 @@ service: receivers: [otlp] exporters: [prometheus, debug] `, - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, { - Name: "prometheus", - Port: 9090, + ServicePort: corev1.ServicePort{ + Name: "prometheus", + Port: 9090, + }, }, }, expectedPorts: []corev1.ContainerPort{ @@ -261,19 +281,25 @@ service: metrics: exporters: [prometheus/prod, prometheus/dev, debug] `, - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, { - Name: "prometheus-dev", - Port: 9091, + ServicePort: corev1.ServicePort{ + Name: "prometheus-dev", + Port: 9091, + }, }, { - Name: "prometheus-prod", - Port: 9090, + ServicePort: corev1.ServicePort{ + Name: "prometheus-prod", + Port: 9090, + }, }, }, expectedPorts: []corev1.ContainerPort{ @@ -293,11 +319,13 @@ service: specConfig: `exporters: prometheusremotewrite/prometheus: endpoint: http://prometheus-server.monitoring/api/v1/write`, - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, }, expectedPorts: []corev1.ContainerPort{metricContainerPort}, @@ -317,19 +345,25 @@ service: pipelines: metrics: exporters: [prometheus/prod, prometheus/dev, prometheusremotewrite/prometheus, debug]`, - specPorts: []corev1.ServicePort{ + specPorts: []v1beta1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, { - Name: "prometheus-dev", - Port: 9091, + ServicePort: corev1.ServicePort{ + Name: "prometheus-dev", + Port: 9091, + }, }, { - Name: "prometheus-prod", - Port: 9090, + ServicePort: corev1.ServicePort{ + Name: "prometheus-prod", + Port: 9090, + }, }, }, expectedPorts: []corev1.ContainerPort{ diff --git a/internal/manifests/collector/ingress.go b/internal/manifests/collector/ingress.go index 18c6d0cb6c..f8a7530d3d 100644 --- a/internal/manifests/collector/ingress.go +++ b/internal/manifests/collector/ingress.go @@ -161,7 +161,7 @@ func servicePortsFromCfg(logger logr.Logger, otelcol v1beta1.OpenTelemetryCollec // in the first case, we remove the port we inferred from the list // in the second case, we rename our inferred port to something like "port-%d" portNumbers, portNames := extractPortNumbersAndNames(otelcol.Spec.Ports) - var resultingInferredPorts []corev1.ServicePort + var resultingInferredPorts []v1beta1.PortsSpec for _, inferred := range ports { if filtered := filterPort(logger, inferred, portNumbers, portNames); filtered != nil { resultingInferredPorts = append(resultingInferredPorts, *filtered) @@ -169,5 +169,11 @@ func servicePortsFromCfg(logger logr.Logger, otelcol v1beta1.OpenTelemetryCollec } ports = append(otelcol.Spec.Ports, resultingInferredPorts...) } - return ports, err + + svcPorts := []corev1.ServicePort{} + for _, p := range ports { + svcPorts = append(svcPorts, p.ServicePort) + } + + return svcPorts, err } diff --git a/internal/manifests/collector/service.go b/internal/manifests/collector/service.go index 333b3e5254..7b834bc751 100644 --- a/internal/manifests/collector/service.go +++ b/internal/manifests/collector/service.go @@ -136,7 +136,7 @@ func Service(params manifests.Params) (*corev1.Service, error) { // in the first case, we remove the port we inferred from the list // in the second case, we rename our inferred port to something like "port-%d" portNumbers, portNames := extractPortNumbersAndNames(params.OtelCol.Spec.Ports) - var resultingInferredPorts []corev1.ServicePort + var resultingInferredPorts []v1beta1.PortsSpec for _, inferred := range ports { if filtered := filterPort(params.Log, inferred, portNumbers, portNames); filtered != nil { resultingInferredPorts = append(resultingInferredPorts, *filtered) @@ -158,6 +158,11 @@ func Service(params manifests.Params) (*corev1.Service, error) { trafficPolicy = corev1.ServiceInternalTrafficPolicyLocal } + svcPorts := []corev1.ServicePort{} + for _, p := range ports { + svcPorts = append(svcPorts, p.ServicePort) + } + return &corev1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: naming.Service(params.OtelCol.Name), @@ -169,7 +174,7 @@ func Service(params manifests.Params) (*corev1.Service, error) { InternalTrafficPolicy: &trafficPolicy, Selector: manifestutils.SelectorLabels(params.OtelCol.ObjectMeta, ComponentOpenTelemetryCollector), ClusterIP: "", - Ports: ports, + Ports: svcPorts, }, }, nil } @@ -191,7 +196,7 @@ func newPortNumberKey(port int32, protocol corev1.Protocol) PortNumberKey { return PortNumberKey{Port: port, Protocol: protocol} } -func filterPort(logger logr.Logger, candidate corev1.ServicePort, portNumbers map[PortNumberKey]bool, portNames map[string]bool) *corev1.ServicePort { +func filterPort(logger logr.Logger, candidate v1beta1.PortsSpec, portNumbers map[PortNumberKey]bool, portNames map[string]bool) *v1beta1.PortsSpec { if portNumbers[newPortNumberKey(candidate.Port, candidate.Protocol)] { return nil } @@ -217,7 +222,7 @@ func filterPort(logger logr.Logger, candidate corev1.ServicePort, portNumbers ma return &candidate } -func extractPortNumbersAndNames(ports []corev1.ServicePort) (map[PortNumberKey]bool, map[string]bool) { +func extractPortNumbersAndNames(ports []v1beta1.PortsSpec) (map[PortNumberKey]bool, map[string]bool) { numbers := map[PortNumberKey]bool{} names := map[string]bool{} diff --git a/internal/manifests/collector/service_test.go b/internal/manifests/collector/service_test.go index 0498a071a8..441fb31493 100644 --- a/internal/manifests/collector/service_test.go +++ b/internal/manifests/collector/service_test.go @@ -30,11 +30,11 @@ import ( func TestExtractPortNumbersAndNames(t *testing.T) { t.Run("should return extracted port names and numbers", func(t *testing.T) { - ports := []v1.ServicePort{ - {Name: "web", Port: 8080}, - {Name: "tcp", Port: 9200}, - {Name: "web-explicit", Port: 80, Protocol: v1.ProtocolTCP}, - {Name: "syslog-udp", Port: 514, Protocol: v1.ProtocolUDP}, + ports := []v1beta1.PortsSpec{ + {ServicePort: v1.ServicePort{Name: "web", Port: 8080}}, + {ServicePort: v1.ServicePort{Name: "tcp", Port: 9200}}, + {ServicePort: v1.ServicePort{Name: "web-explicit", Port: 80, Protocol: v1.ProtocolTCP}}, + {ServicePort: v1.ServicePort{Name: "syslog-udp", Port: 514, Protocol: v1.ProtocolUDP}}, } expectedPortNames := map[string]bool{"web": true, "tcp": true, "web-explicit": true, "syslog-udp": true} expectedPortNumbers := map[PortNumberKey]bool{ @@ -55,14 +55,14 @@ func TestFilterPort(t *testing.T) { tests := []struct { name string - candidate v1.ServicePort + candidate v1beta1.PortsSpec portNumbers map[PortNumberKey]bool portNames map[string]bool - expected v1.ServicePort + expected v1beta1.PortsSpec }{ { name: "should filter out duplicate port", - candidate: v1.ServicePort{Name: "web", Port: 8080}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKeyByPort(8080): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, @@ -70,7 +70,7 @@ func TestFilterPort(t *testing.T) { { name: "should filter out duplicate port, protocol specified (TCP)", - candidate: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolTCP}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolTCP}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKeyByPort(8080): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, @@ -78,7 +78,7 @@ func TestFilterPort(t *testing.T) { { name: "should filter out duplicate port, protocol specified (UDP)", - candidate: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolUDP}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolUDP}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKey(8080, v1.ProtocolUDP): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, @@ -86,52 +86,52 @@ func TestFilterPort(t *testing.T) { { name: "should not filter unique port", - candidate: v1.ServicePort{Name: "web", Port: 8090}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8090}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKeyByPort(8080): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, - expected: v1.ServicePort{Name: "web", Port: 8090}, + expected: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8090}}, }, { name: "should not filter same port with different protocols", - candidate: v1.ServicePort{Name: "web", Port: 8080}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKey(8080, v1.ProtocolUDP): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, - expected: v1.ServicePort{Name: "web", Port: 8080}, + expected: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080}}, }, { name: "should not filter same port with different protocols, candidate has specified port (TCP vs UDP)", - candidate: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolTCP}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolTCP}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKey(8080, v1.ProtocolUDP): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, - expected: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolTCP}, + expected: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolTCP}}, }, { name: "should not filter same port with different protocols, candidate has specified port (UDP vs TCP)", - candidate: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolUDP}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolUDP}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKeyByPort(8080): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"test": true, "metrics": true}, - expected: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolUDP}, + expected: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8080, Protocol: v1.ProtocolUDP}}, }, { name: "should change the duplicate portName", - candidate: v1.ServicePort{Name: "web", Port: 8090}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8090}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKeyByPort(8080): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"web": true, "metrics": true}, - expected: v1.ServicePort{Name: "port-8090", Port: 8090}, + expected: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "port-8090", Port: 8090}}, }, { name: "should return nil if fallback name clashes with existing portName", - candidate: v1.ServicePort{Name: "web", Port: 8090}, + candidate: v1beta1.PortsSpec{ServicePort: v1.ServicePort{Name: "web", Port: 8090}}, portNumbers: map[PortNumberKey]bool{ newPortNumberKeyByPort(8080): true, newPortNumberKeyByPort(9200): true}, portNames: map[string]bool{"web": true, "port-8090": true}, @@ -140,7 +140,7 @@ func TestFilterPort(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { actual := filterPort(logger, test.candidate, test.portNumbers, test.portNames) - if test.expected != (v1.ServicePort{}) { + if test.expected != (v1beta1.PortsSpec{}) { assert.Equal(t, test.expected, *actual) return } @@ -168,12 +168,13 @@ func TestDesiredService(t *testing.T) { t.Run("should return service with port mentioned in OtelCol.Spec.Ports and inferred ports", func(t *testing.T) { grpc := "grpc" - jaegerPorts := v1.ServicePort{ - Name: "jaeger-grpc", - Protocol: "TCP", - Port: 14250, - AppProtocol: &grpc, - } + jaegerPorts := v1beta1.PortsSpec{ + ServicePort: v1.ServicePort{ + Name: "jaeger-grpc", + Protocol: "TCP", + Port: 14250, + AppProtocol: &grpc, + }} params := deploymentParams() ports := append(params.OtelCol.Spec.Ports, jaegerPorts) expected := service("test-collector", ports) @@ -186,12 +187,13 @@ func TestDesiredService(t *testing.T) { t.Run("on OpenShift gRPC appProtocol should be h2c", func(t *testing.T) { h2c := "h2c" - jaegerPort := v1.ServicePort{ - Name: "jaeger-grpc", - Protocol: "TCP", - Port: 14250, - AppProtocol: &h2c, - } + jaegerPort := v1beta1.PortsSpec{ + ServicePort: v1.ServicePort{ + Name: "jaeger-grpc", + Protocol: "TCP", + Port: 14250, + AppProtocol: &h2c, + }} params := deploymentParams() @@ -208,12 +210,13 @@ func TestDesiredService(t *testing.T) { t.Run("should return service with local internal traffic policy", func(t *testing.T) { grpc := "grpc" - jaegerPorts := v1.ServicePort{ - Name: "jaeger-grpc", - Protocol: "TCP", - Port: 14250, - AppProtocol: &grpc, - } + jaegerPorts := v1beta1.PortsSpec{ + ServicePort: v1.ServicePort{ + Name: "jaeger-grpc", + Protocol: "TCP", + Port: 14250, + AppProtocol: &grpc, + }} p := paramsWithMode(v1beta1.ModeDaemonSet) ports := append(p.OtelCol.Spec.Ports, jaegerPorts) expected := serviceWithInternalTrafficPolicy("test-collector", ports, v1.ServiceInternalTrafficPolicyLocal) @@ -277,14 +280,19 @@ func TestMonitoringService(t *testing.T) { }) } -func service(name string, ports []v1.ServicePort) v1.Service { +func service(name string, ports []v1beta1.PortsSpec) v1.Service { return serviceWithInternalTrafficPolicy(name, ports, v1.ServiceInternalTrafficPolicyCluster) } -func serviceWithInternalTrafficPolicy(name string, ports []v1.ServicePort, internalTrafficPolicy v1.ServiceInternalTrafficPolicyType) v1.Service { +func serviceWithInternalTrafficPolicy(name string, ports []v1beta1.PortsSpec, internalTrafficPolicy v1.ServiceInternalTrafficPolicyType) v1.Service { params := deploymentParams() labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{}) + svcPorts := []v1.ServicePort{} + for _, p := range ports { + svcPorts = append(svcPorts, p.ServicePort) + } + return v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -296,7 +304,7 @@ func serviceWithInternalTrafficPolicy(name string, ports []v1.ServicePort, inter InternalTrafficPolicy: &internalTrafficPolicy, Selector: manifestutils.SelectorLabels(params.OtelCol.ObjectMeta, ComponentOpenTelemetryCollector), ClusterIP: "", - Ports: ports, + Ports: svcPorts, }, } } diff --git a/internal/manifests/collector/suite_test.go b/internal/manifests/collector/suite_test.go index e16b5699e3..1f2654ba60 100644 --- a/internal/manifests/collector/suite_test.go +++ b/internal/manifests/collector/suite_test.go @@ -78,15 +78,19 @@ func paramsWithMode(mode v1beta1.Mode) manifests.Params { OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ Image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0", - Ports: []v1.ServicePort{{ - Name: "web", - Port: 80, - TargetPort: intstr.IntOrString{ - Type: intstr.Int, - IntVal: 80, + Ports: []v1beta1.PortsSpec{ + { + ServicePort: v1.ServicePort{ + Name: "web", + Port: 80, + TargetPort: intstr.IntOrString{ + Type: intstr.Int, + IntVal: 80, + }, + NodePort: 0, + }, }, - NodePort: 0, - }}, + }, Replicas: &replicas, }, Config: cfg, @@ -139,15 +143,19 @@ func newParams(taContainerImage string, file string, options ...config.Option) ( }, Spec: v1beta1.OpenTelemetryCollectorSpec{ OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{ - Ports: []v1.ServicePort{{ - Name: "web", - Port: 80, - TargetPort: intstr.IntOrString{ - Type: intstr.Int, - IntVal: 80, + Ports: []v1beta1.PortsSpec{ + { + ServicePort: v1.ServicePort{ + Name: "web", + Port: 80, + TargetPort: intstr.IntOrString{ + Type: intstr.Int, + IntVal: 80, + }, + NodePort: 0, + }, }, - NodePort: 0, - }}, + }, Replicas: &replicas, }, diff --git a/pkg/sidecar/pod_test.go b/pkg/sidecar/pod_test.go index a15548c62d..61209ece5c 100644 --- a/pkg/sidecar/pod_test.go +++ b/pkg/sidecar/pod_test.go @@ -54,11 +54,13 @@ func TestAddSidecarWhenNoSidecarExists(t *testing.T) { Namespace: "some-app", }, Spec: v1alpha1.OpenTelemetryCollectorSpec{ - Ports: []corev1.ServicePort{ + Ports: []v1alpha1.PortsSpec{ { - Name: "metrics", - Port: 8888, - Protocol: corev1.ProtocolTCP, + ServicePort: corev1.ServicePort{ + Name: "metrics", + Port: 8888, + Protocol: corev1.ProtocolTCP, + }, }, }, InitContainers: []corev1.Container{ diff --git a/tests/e2e/smoke-ports/00-assert.yaml b/tests/e2e/smoke-ports/00-assert.yaml new file mode 100644 index 0000000000..792c481802 --- /dev/null +++ b/tests/e2e/smoke-ports/00-assert.yaml @@ -0,0 +1,37 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: smoke-ports-collector +spec: + template: + spec: + containers: + - name: otc-container + ports: + - containerPort: 14250 + name: jaeger-grpc + protocol: TCP + - containerPort: 8888 + name: metrics + protocol: TCP + - containerPort: 4317 + name: otlp-grpc + protocol: TCP + hostPort: 4317 +--- +apiVersion: v1 +kind: Service +metadata: + name: smoke-ports-collector +spec: + ports: + - appProtocol: grpc + name: otlp-grpc + port: 4317 + protocol: TCP + targetPort: 4317 + - appProtocol: grpc + name: jaeger-grpc + port: 14250 + protocol: TCP + targetPort: 14250 diff --git a/tests/e2e/smoke-ports/00-install.yaml b/tests/e2e/smoke-ports/00-install.yaml new file mode 100644 index 0000000000..1326c61f40 --- /dev/null +++ b/tests/e2e/smoke-ports/00-install.yaml @@ -0,0 +1,27 @@ +apiVersion: opentelemetry.io/v1alpha1 +kind: OpenTelemetryCollector +metadata: + name: smoke-ports +spec: + mode: daemonset + ports: + - appProtocol: grpc + name: otlp-grpc + port: 4317 + protocol: TCP + targetPort: 4317 + hostPort: 4317 + config: | + receivers: + jaeger: + protocols: + grpc: {} + processors: + exporters: + debug: {} + service: + pipelines: + traces: + receivers: [jaeger] + processors: [] + exporters: [debug] diff --git a/tests/e2e/smoke-ports/chainsaw-test.yaml b/tests/e2e/smoke-ports/chainsaw-test.yaml new file mode 100755 index 0000000000..3d9816ddf9 --- /dev/null +++ b/tests/e2e/smoke-ports/chainsaw-test.yaml @@ -0,0 +1,14 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: smoke-ports +spec: + steps: + - name: step-00 + try: + - apply: + file: 00-install.yaml + - assert: + file: 00-assert.yaml