Change deploymentName to cluster

Author: burhan-nr

charts/nr-ebpf-agent/README.md

@@ -6,14 +6,14 @@ A Helm chart to monitor a Kubernetes Cluster using the eBPF agent.
 
 # Helm installation
 
-1. Download and modify the default configuration file [values.yaml](https://github.com/newrelic/helm-charts/blob/master/charts/nr-ebpf-agent/values.yaml#L1-L4). At minimum, you will need populate the `licenseKey` field with a valid New Relic Ingest key and the `deploymentName` field with the name of the cluster to monitor.
+1. Download and modify the default configuration file [values.yaml](https://github.com/newrelic/helm-charts/blob/master/charts/nr-ebpf-agent/values.yaml#L1-L4). At minimum, you will need populate the `licenseKey` field with a valid New Relic Ingest key and the `cluster` field with the name of the cluster to monitor.
 
 **NOTE: From chart version 0.2.x onwards, please use the latest [values.yaml](https://github.com/newrelic/helm-charts/blob/master/charts/nr-ebpf-agent/values.yaml) bundled with each Helm release. This will ensure compatibility with new features and configuration options.**
 
 Example:
 ```
 licenseKey: "EXAMPLEINGESTLICENSEKEY345878592NRALL"
-deploymentName: "name-of-cluster-to-monitor"
+cluster: "name-of-cluster-to-monitor"
 ```
 
 2. Install the helm chart, passing the configuration file created above.
@@ -78,7 +78,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 |-----|------|---------|-------------|
 | affinity | object | `{}` | Sets all pods' affinities. Can be configured also with `global.affinity` |
 | allowServiceNameRegex | string | `""` | This config acts as a bypass for the dropDataServiceNameRegex config. Service names that match this regex will not have their data dropped by the dropDataServiceNameRegex. If dropDataServiceNameRegex is not defined, this config has no impact on the eBPF agent. |
-| deploymentName | string | `""` | Name of the Kubernetes cluster to be monitored. Mandatory. Can be configured with `global.deploymentName` |
+| cluster | string | `""` | Name of the Kubernetes cluster to be monitored. Mandatory. Can be configured with `global.cluster` |
 | containerSecurityContext | object | `{}` | Sets all pods' containerSecurityContext. Can be configured also with `global.securityContext.container` |
 | customSecretLicenseKey | string | `""` | In case you don't want to have the license key in your values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
 | customSecretName | string | `""` | In case you don't want to have the license key in your values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName` |

charts/nr-ebpf-agent/README.md.gotmpl

@@ -7,12 +7,12 @@
 
 # Helm installation
 
-1. Download and modify the default configuration file [values.yaml](https://github.com/newrelic/helm-charts/blob/master/charts/nr-ebpf-agent/values.yaml#L1-L4). At minimum, you will need populate the `licenseKey` field with a valid New Relic Ingest key and the `deploymentName` field with the name of the cluster to monitor.
+1. Download and modify the default configuration file [values.yaml](https://github.com/newrelic/helm-charts/blob/master/charts/nr-ebpf-agent/values.yaml#L1-L4). At minimum, you will need populate the `licenseKey` field with a valid New Relic Ingest key and the `cluster` field with the name of the cluster to monitor.
 
 Example:
 ```
 licenseKey: "EXAMPLEINGESTLICENSEKEY345878592NRALL"
-deploymentName: "name-of-cluster-to-monitor"
+cluster: "name-of-cluster-to-monitor"
 ```
 
 2. Install the helm chart, passing the configuration file created above.

charts/nr-ebpf-agent/ci/test-values.yaml

@@ -1,2 +1,2 @@
-deploymentName: "test-ebpf-agent-cluster"
+cluster: "test-ebpf-agent-cluster"
 licenseKey: "1234567890abcdef1234567890abcdef12345678"

charts/nr-ebpf-agent/templates/_helpers.tpl

@@ -46,7 +46,7 @@ Return the cluster name
 */}}
 {{- define "nr-ebpf-agent.clusterName" -}}
 {{- if .Values.global }}
-   {{- .Values.global.deploymentName | default "" -}}
+   {{- .Values.global.cluster | default "" -}}
 {{- else -}}
     {{- "" -}}
 {{- end -}}

charts/nr-ebpf-agent/templates/nr-ebpf-agent-daemonset.yaml

@@ -87,7 +87,7 @@ spec:
         resources: {{ .Values.ebpfClient.resources | toYaml | nindent 10 }}
         env:
           - name: DEPLOYMENT_NAME
-            value: {{ .Values.deploymentName }}
+            value: {{ .Values.cluster }}
           - name: HOST_IP
             valueFrom:
               fieldRef:

charts/nr-ebpf-agent/templates/otel-collector-config.yaml

@@ -257,5 +257,5 @@ data:
   {{- if $globalClusterName}}
   clusterName: {{ $globalClusterName }}
   {{ else }}
-  clusterName: {{ required "Please set the Kubernetes cluster name" .Values.deploymentName | quote }}
+  clusterName: {{ required "Please set the Kubernetes cluster name" .Values.cluster | quote }}
   {{ end }}

charts/nr-ebpf-agent/values.yaml

@@ -1,6 +1,6 @@
 ---
-# -- Name of the Kubernetes cluster to be monitored. Mandatory. Can be configured with `global.deploymentName`
-deploymentName: ""
+# -- Name of the Kubernetes cluster to be monitored. Mandatory. Can be configured with `global.cluster`
+cluster: ""
 # -- The license key to use. Can be configured with `global.licenseKey`
 licenseKey: ""
 # -- In case you don't want to have the license key in your values, this allows you to point to a user created secret to get the key from there. Can be configured also with `global.customSecretName`