[opentelemetry-kube-stack] Use chart's top-level resourceAttributes for k8s.cluster.name and deployment.environment.name

[kangyili]

What does this PR do?

Upstream chart PR open-telemetry/opentelemetry-helm-charts#2393 adds a top-level resourceAttributes map that renders as a resource/global upsert processor on every collector pipeline and is merged into the Instrumentation CR's resource.resourceAttributes.

This lets us delete our homegrown workaround for contrib#49970 and unify how k8s.cluster.name and deployment.environment.name get set.

[cyrille-leclerc]

Successfully tested

[cyrille-leclerc]

should it be upsert, overwriting? or just inserting if not defined? Probably a question on the upstream feature rather than on our usage of it.

[kangyili]

I’m okay with upsert
For supported cloud providers, the cluster name is auto-detected, and the installation script doesn’t add k8s.cluster.name to the resourceAttributes.

If a user explicitly sets the cluster name in resourceAttributes, we can assume they want to override the value, so upsert makes sense.

[mx-psi]

Changes look good, could we avoid the newline changes in all rendered examples?

[kangyili]

Changes look good, could we avoid the newline changes in all rendered examples?

@mx-psi Somehow the file formatting in the main branch is broken. I think the new line change is generated by make generate-examples. I didn’t modify the Makefile except for bumping the Helm chart version.
Feel free to test it on your side too, just in case it’s an issue with my local setup.