Remove redundant service.ports

signalfx · May 17, 2021 · a94cbe4 · a94cbe4
1 parent 8c67754
commit a94cbe4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+### Removed
+
+- Removed `service.ports`, sourced from `otelCollector.ports` instead (#XXX)
+
 ## [0.25.0] - 2021-05-07
 
 ### Changed

diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml
@@ -16,7 +16,7 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-  {{- range $key, $port := .Values.service.ports }}
+  {{- range $key, $port := .Values.otelCollector.ports }}
   - name: {{ $key }}
     port: {{ $port.containerPort }}
     targetPort: {{ $port.targetPort }}

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -689,37 +689,3 @@ service:
   type: ClusterIP
   # Service annotations
   annotations: {}
-  # Ports exposed by the opentelemetry collector service. Container named ports used.
-  ports:
-    otlp:
-      containerPort: 4317
-      targetPort: otlp
-      protocol: TCP
-    jaeger-thrift:
-      containerPort: 14268
-      targetPort: jaeger-thrift
-      protocol: TCP
-    jaeger-grpc:
-      containerPort: 14250
-      targetPort: jaeger-grpc
-      protocol: TCP
-    zipkin:
-      containerPort: 9411
-      targetPort: zipkin
-      protocol: TCP
-    sapm:
-      containerPort: 7276
-      targetPort: sapm
-      protocol: TCP
-    signalfx:
-      containerPort: 9943
-      targetPort: signalfx
-      protocol: TCP
-    fluentforward:
-      containerPort: 8006
-      targetPort: fluentforward
-      protocol: TCP
-    http-forwarder:
-      containerPort: 6060
-      targetPort: http-forwarder
-      protocol: TCP