Merge branch 'main' into fix/collector-resource-limits-warning

TylerHelmuth · web-flow · commit 86801b966d94 · 2025-04-21T10:12:37.000-06:00
diff --git a/charts/opentelemetry-collector/templates/service.yaml b/charts/opentelemetry-collector/templates/service.yaml
@@ -15,6 +15,9 @@ metadata:
   {{- end }}
 spec:
   type: {{ .Values.service.type }}
+  {{- if .Values.service.trafficDistribution }}
+  trafficDistribution: {{ .Values.service.trafficDistribution }}
+  {{- end }}
   {{- if .Values.service.clusterIP }}
   clusterIP: {{ .Values.service.clusterIP }}
   {{- end }}
diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json
@@ -693,6 +693,12 @@
         "enabled": {
           "type": "boolean"
         },
+        "trafficDistribution": {
+          "type": "string",
+          "enum": [
+            "PreferClose"
+          ]
+        },
         "type": {
           "type": "string",
           "enum": [
diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
@@ -514,6 +514,7 @@ service:
   # enabled: true
 
   type: ClusterIP
+  # trafficDistribution: PreferClose
   # type: LoadBalancer
   # loadBalancerIP: 1.2.3.4
   # loadBalancerSourceRanges: []
