Remove deprecated extraAttributes.podLabels values.yaml option (#1994)

Author: dmitryax

.chloggen/remove-deprecated-podlabels.yaml

@@ -0,0 +1,14 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: chart
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove deprecated `extraAttributes.podLabels` configuration option.
+# One or more tracking issues related to the change
+issues: [1994]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  This option was deprecated in version 0.38.0 in favor of `extraAttributes.fromLabels`.
+  See migration guide: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0371-to-0380

helm-charts/splunk-otel-collector/templates/NOTES.txt

@@ -19,10 +19,6 @@ Splunk OpenTelemetry Collector is installed and configured to send data to Splun
 [WARNING] The ".Values.service" config is deprecated. Please use ".Values.agent.service" and ".Values.gateway.service" for configuring services for the agent and gateway, respectively.
           This field will be removed in a future release.
 {{ end }}
-{{- if not (eq (toString .Values.extraAttributes.podLabels) "<nil>") }}
-[WARNING] ".Values.extraAttributes.podLabels" parameter is deprecated, please use ".Values.extraAttributes.fromLabels" instead.
-          Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0371-to-0380
-{{ end }}
 {{- if not (eq (toString .Values.image.fluentd.initContainer) "<nil>") }}
 [WARNING] "image.fluentd.initContainer" parameter is deprecated now. Now we use the same splunk/fluentd-hec image in init container.
           Upgrade guidelines: https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UPGRADING.md#0371-to-0380

helm-charts/splunk-otel-collector/templates/config/_common.tpl

@@ -223,11 +223,8 @@ k8sattributes:
         tag_name: com.splunk.index
         from: pod
       {{- include "splunk-otel-collector.addExtraAnnotations" . | nindent 6 }}
-    {{- if or .Values.extraAttributes.podLabels .Values.extraAttributes.fromLabels }}
+    {{- if .Values.extraAttributes.fromLabels }}
     labels:
-      {{- range .Values.extraAttributes.podLabels }}
-      - key: {{ . }}
-      {{- end }}
       {{- include "splunk-otel-collector.addExtraLabels" . | nindent 6 }}
     {{- end }}
 {{- end }}
@@ -342,11 +339,6 @@ resource/logs:
     - key: label_app
       from_attribute: k8s.pod.labels.app
       action: upsert
-    {{- range $_, $label := .Values.extraAttributes.podLabels }}
-    - key: {{ printf "label_%s" $label }}
-      from_attribute: {{ printf "k8s.pod.labels.%s" $label }}
-      action: upsert
-    {{- end }}
     {{- if not .Values.splunkPlatform.fieldNameConvention.keepOtelConvention }}
     - key: k8s.container.name
       action: delete
@@ -360,10 +352,6 @@ resource/logs:
       action: delete
     - key: k8s.pod.labels.app
       action: delete
-    {{- range $_, $label := .Values.extraAttributes.podLabels }}
-    - key: {{ printf "k8s.pod.labels.%s" $label }}
-      action: delete
-    {{- end }}
     {{- end }}
     {{- end }}
 {{- end }}

helm-charts/splunk-otel-collector/values.schema.json

@@ -313,12 +313,6 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "podLabels": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
         "fromLabels": {
           "type": "array",
           "items": {