fix(collector): Whitespace/newline issues regarding additionalLabels

[brdotv2]

When providing values to the additionalLabels config object, they are added inline with the last label defined in opentelemetry-collector.labels in _helpers.tpl which makes the deployment of the Chart fail.

# values.yaml
global:
  test: templated-value

mode: deployment

additionalLabels:
  testLabel: "{{ .Values.global.test }}"
  someLabel: "someValue"

Current output:

---
# Source: opentelemetry-collector/templates/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
  name: release-name-opentelemetry-collector
  namespace: default
  labels:
    helm.sh/chart: opentelemetry-collector-0.110.4
    app.kubernetes.io/name: opentelemetry-collector
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "0.114.0"
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: standalone-collectorsomeLabel: someValue     <------ issue
    testLabel: 'templated-value'
---

By wrapping the include in an if statement, the labels are printed out correctly with the expected newline.

---
# Source: opentelemetry-collector/templates/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
  name: release-name-opentelemetry-collector
  namespace: default
  labels:
    helm.sh/chart: opentelemetry-collector-0.110.4
    app.kubernetes.io/name: opentelemetry-collector
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "0.114.0"
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: standalone-collector
    someLabel: someValue
    testLabel: 'templated-value'
---

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: brdotv2 (6bb6004, d18a5e2, 750cade, 0f7676a, 152b6b9, 6dfa039, 4879b82)

[povilasv]

Please run make generate-examples CHARTS=opentelemetry-collector and commit the changes

[brdotv2]

Please run make generate-examples CHARTS=opentelemetry-collector and commit the changes

i have, but there are no changes. Do you maybe want me to update some of the example values.yaml files to include some values for additionalLabels? @povilasv

[povilasv]

I think you forgot to bump the patch version, that's why not changes

[TylerHelmuth]

@brdotv2 we've been merging other PRs but if you can get the patch version bumped and examples generated one more time I'll merge this next

[brdotv2]

@TylerHelmuth done, thanks!