Merge branch 'master' into dbudziwojski/otel-improvements

# Conflicts:
#	charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml

Author: dbudziwojskiNR

charts/agent-control/Chart.lock

@@ -4,9 +4,9 @@ dependencies:
   version: 2.14.1
 - name: agent-control-deployment
   repository: ""
-  version: 0.0.42-beta
+  version: 0.0.43-beta
 - name: common-library
   repository: https://helm-charts.newrelic.com
   version: 1.3.1
-digest: sha256:af3a56b5b32d661139441f50887c99a69ad3cf4c32e393b1cec71e38c257fcdf
-generated: "2025-02-27T12:26:06.411355+01:00"
+digest: sha256:c48931832ecebf5cf8572616cdb15580df0f0b1c11b008d4ec741a4f35dcc83c
+generated: "2025-03-05T16:37:35.732903+01:00"

charts/agent-control/Chart.yaml

@@ -3,15 +3,15 @@ name: agent-control
 description: Bootstraps New Relic' Agent Control
 
 type: application
-version: 0.0.52-beta
+version: 0.0.55-beta
 
 dependencies:
   - name: flux2
     repository: https://fluxcd-community.github.io/helm-charts
     version: 2.14.1
     condition: flux2.enabled
   - name: agent-control-deployment
-    version: 0.0.42-beta
+    version: 0.0.43-beta
     condition: agent-control-deployment.enabled
     # The following dependency is needed as sub-dependency of agent-control-deployment
   - name: common-library

charts/agent-control/README.md

@@ -26,6 +26,20 @@ means that it honors a wide range of defaults and globals common to most New Rel
 Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
 [user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
 
+## Flux Integration
+
+Agent Control leverages [Flux](https://github.com/fluxcd/flux2) custom resources to automate the deployment of New Relic agents. This chart includes Flux as a dependency by default, eliminating the need for separate installation.
+
+### Using an Existing Flux Installation
+
+To use an existing Flux setup, disable the default installation by setting `flux2.enabled` to `false` in your values. Ensure your existing Flux installation meets the following requirements:
+
+- Agent control is compatible with **Flux Versions**: 2.3.x, 2.4.x, or 2.5.x.
+- **CRDs Required**:
+  - `source.toolkit.fluxcd.io/v1` for HelmRepository
+  - `helm.toolkit.fluxcd.io/v2` for HelmRelease
+- **Namespace Access**: Must be configured to watch resources in the `newrelic` namespace, or the namespace where Agent Control is deployed.
+
 ## Test custom agentTypes
 
 In order to test custom agentTypes is possible to leverage `extraVolumeMounts` and `extraVolumes` once you have created the configMap in the namespace.
@@ -72,12 +86,12 @@ As of the creation of the chart, it has no particularities and this section can
 | agent-control-deployment.config.agentControl.content | object | `{}` | Overrides the configuration that has been created automatically by the chart. This configuration here will be **MERGED** with the configuration specified above. If you need to have you own configuration, disabled the creation of this configMap and create your own. |
 | agent-control-deployment.config.agentControl.create | bool | `true` | Set if the configMap is going to be created by this chart or the user will provide its own. |
 | agent-control-deployment.config.fleet_control.auth.organizationId | string | `""` | Organization ID where fleets will live. |
-| agent-control-deployment.config.fleet_control.auth.secret.client_id.base64 | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set client ID directly as base64. This options is mutually exclusive with `plain`. |
-| agent-control-deployment.config.fleet_control.auth.secret.client_id.plain | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set client ID directly as plain text. This options is mutually exclusive with `base64`. |
+| agent-control-deployment.config.fleet_control.auth.secret.client_id.base64 | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set client ID directly as base64 if you want to skip its creation. This options is mutually exclusive with `plain`. |
+| agent-control-deployment.config.fleet_control.auth.secret.client_id.plain | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set client ID directly as plain text if you want to skip its creation. This options is mutually exclusive with `base64`. |
 | agent-control-deployment.config.fleet_control.auth.secret.client_id.secret_key | string | `client_id` | Key inside the secret containing the client ID. |
 | agent-control-deployment.config.fleet_control.auth.secret.name | string | release name suffixed with "-auth" | Name auth' secret provided by the user. If the creation of this secret is set to `true`, this is the same the secret will have. |
-| agent-control-deployment.config.fleet_control.auth.secret.private_key.base64_pem | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set private key directly as base64. This options is mutually exclusive with `plain_pem`. |
-| agent-control-deployment.config.fleet_control.auth.secret.private_key.plain_pem | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set private key directly as plain text. This options is mutually exclusive with `base64_pem`. |
+| agent-control-deployment.config.fleet_control.auth.secret.private_key.base64_pem | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set private key directly as base64 if you want to skip its creation. This options is mutually exclusive with `plain_pem`. |
+| agent-control-deployment.config.fleet_control.auth.secret.private_key.plain_pem | string | `nil` | In case `.config.auth.secret.create` is true, you can set these keys to set private key directly as plain text if you want to skip its creation. This options is mutually exclusive with `base64_pem`. |
 | agent-control-deployment.config.fleet_control.auth.secret.private_key.secret_key | string | `private_key` | Key inside the secret containing the private key. |
 | agent-control-deployment.config.fleet_control.enabled | bool | `true` | Enables or disables the auth against fleet control. It implies to disable any fleet communication and running the agent in stand alone mode where only the agents specified on `.config.subAgents` will be launched. |
 | agent-control-deployment.config.fleet_control.fleet_id | string | `""` | Specify a fleet_id to automatically connect the Agent Control to an existing fleet. |
@@ -95,12 +109,13 @@ As of the creation of the chart, it has no particularities and this section can
 | agent-control-deployment.extraVolumes | list | `[]` | Volumes to mount in the containers |
 | agent-control-deployment.fedramp.enabled | bool | `false` | TODO: Enables FedRAMP. Can be configured also with `global.fedramp.enabled` |
 | agent-control-deployment.hostNetwork | bool | `false` | Sets pod's hostNetwork. Can be configured also with `global.hostNetwork` |
+| agent-control-deployment.identityClientId | string | `""` | Identity client_id to use. |
+| agent-control-deployment.identityClientSecret | string | `""` | Identity client_secret to use. |
 | agent-control-deployment.image | object | See `values.yaml` | Image for the New Relic Agent Control |
 | agent-control-deployment.image.pullSecrets | list | `[]` | The secrets that are needed to pull images from a custom registry. |
-| agent-control-deployment.identityClientId | string | `""` | identity client_id to use. |
-| agent-control-deployment.identityClientSecret | string | `""` | identity client_secret to use. |
 | agent-control-deployment.labels | object | `{}` | Additional labels for chart objects. Can be configured also with `global.labels` |
 | agent-control-deployment.licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
+| agent-control-deployment.nameOverride | string | `"agent-control"` | Override the name of the chart used to template resource names. |
 | agent-control-deployment.nodeSelector | object | `{}` | Sets pod's node selector. Can be configured also with `global.nodeSelector` |
 | agent-control-deployment.nrStaging | bool | `false` | Send the metrics to the staging backend. Requires a valid staging license key. Can be configured also with `global.nrStaging` |
 | agent-control-deployment.podAnnotations | object | `{}` | Annotations to be added to all pods created by the integration. |

charts/agent-control/README.md.gotmpl

@@ -31,6 +31,20 @@ means that it honors a wide range of defaults and globals common to most New Rel
 Options that can be defined globally include `affinity`, `nodeSelector`, `tolerations`, `proxy` and others. The full list can be found at
 [user's guide of the common library](https://github.com/newrelic/helm-charts/blob/master/library/common-library/README.md).
 
+## Flux Integration
+
+Agent Control leverages [Flux](https://github.com/fluxcd/flux2) custom resources to automate the deployment of New Relic agents. This chart includes Flux as a dependency by default, eliminating the need for separate installation.
+
+### Using an Existing Flux Installation
+
+To use an existing Flux setup, disable the default installation by setting `flux2.enabled` to `false` in your values. Ensure your existing Flux installation meets the following requirements:
+
+- Agent control is compatible with **Flux Versions**: 2.3.x, 2.4.x, or 2.5.x.
+- **CRDs Required**:
+  - `source.toolkit.fluxcd.io/v1` for HelmRepository
+  - `helm.toolkit.fluxcd.io/v2` for HelmRelease
+- **Namespace Access**: Must be configured to watch resources in the `newrelic` namespace, or the namespace where Agent Control is deployed.
+
 ## Test custom agentTypes
 
 In order to test custom agentTypes is possible to leverage `extraVolumeMounts` and `extraVolumes` once you have created the configMap in the namespace.

charts/agent-control/charts/agent-control-deployment/Chart.yaml

@@ -4,7 +4,7 @@ description: A Helm chart to install New Relic Agent Control on Kubernetes
 
 type: application
 
-version: 0.0.42-beta
+version: 0.0.43-beta
 
 keywords:
   - newrelic

charts/agent-control/charts/agent-control-deployment/templates/preinstall-job-register-system-identity.yaml

@@ -67,6 +67,13 @@ spec:
         - name: register-system-identity
           image: "{{ (.Values.systemIdentityRegistration.image).repository | default "newrelic/agent-control-system-identity-registration" }}:{{ (.Values.systemIdentityRegistration.image).tag | default "latest" }}"
           imagePullPolicy: {{ .Values.systemIdentityRegistration.image.pullPolicy }}
+          resources:
+            limits:
+              cpu: 100m
+              memory: 128Mi
+            requests:
+              cpu: 50m
+              memory: 64Mi
           env:
             {{- if or  (include "newrelic.common.userKey._customSecretName" .) (include "newrelic.common.userKey._userKey" .) }}
             - name: USER_KEY

charts/agent-control/charts/agent-control-deployment/templates/uninstall-job.yaml

@@ -27,6 +27,13 @@ spec:
       containers:
         - name: delete-managed-resources
           image: bitnami/kubectl  # TODO: Pin version to the latest that we support.
+          resources:
+            limits:
+              cpu: 100m
+              memory: 128Mi
+            requests:
+              cpu: 50m
+              memory: 64Mi
           command:
             - bash
           args:

charts/agent-control/values.yaml

@@ -35,7 +35,7 @@ agent-control-deployment:
   image:
     registry:
     repository: newrelic/newrelic-agent-control
-    tag: "0.33.0"
+    tag: "0.34.0"
     pullPolicy: IfNotPresent
     # -- The secrets that are needed to pull images from a custom registry.
     pullSecrets: []

charts/nr-ebpf-agent/Chart.yaml

@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.23
+version: 0.1.24
 
 dependencies:
   - name: common-library

charts/nr-ebpf-agent/README.md

@@ -90,7 +90,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | ebpfAgent.containerSecurityContext | object | `{}` | Sets ebpfAgent pod containerSecurityContext. Overrides `containerSecurityContext` and `global.securityContext.container` |
 | ebpfAgent.image.pullPolicy | string | `"IfNotPresent"` | The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is also set to Always. |
 | ebpfAgent.image.repository | string | `"docker.io/newrelic/newrelic-ebpf-agent"` | eBPF agent image to be deployed. |
-| ebpfAgent.image.tag | string | `"agent-nr-ebpf-agent_0.0.7"` | The tag of the eBPF agent image to be deployed. |
+| ebpfAgent.image.tag | string | `"agent-nr-ebpf-agent_0.0.8"` | The tag of the eBPF agent image to be deployed. |
 | ebpfAgent.podAnnotations | object | `{}` | Sets ebpfAgent pod Annotations. Overrides `podAnnotations` and `global.podAnnotations` |
 | ebpfAgent.podSecurityContext | object | `{}` | Sets ebpfAgent pod podSecurityContext. Overrides `podSecurityContext` and `global.securityContext.pod` |
 | ebpfAgent.resources.limits.memory | string | `"2Gi"` | Max memory allocated to the container. |
@@ -99,7 +99,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | ebpfAgent.tolerations | list | `[]` | Sets ebpfAgent pod tolerations. Overrides `tolerations` and `global.tolerations` |
 | ebpfClient.image.pullPolicy | string | `"IfNotPresent"` | The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is set to Always. |
 | ebpfClient.image.repository | string | `"docker.io/newrelic/newrelic-ebpf-agent"` | eBPF client image to be deployed. |
-| ebpfClient.image.tag | string | `"client-nr-ebpf-client_0.0.11"` | The tag of the eBPF client image to be deployed. |
+| ebpfClient.image.tag | string | `"client-nr-ebpf-client_0.0.12"` | The tag of the eBPF client image to be deployed. |
 | ebpfClient.resources.limits.memory | string | `"100Mi"` | Max memory allocated to the container. |
 | ebpfClient.resources.requests.cpu | string | `"50m"` | Min CPU allocated to the container. |
 | ebpfClient.resources.requests.memory | string | `"50Mi"` | Min memory allocated to the container. |

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

@@ -20,7 +20,8 @@ a cert is loaded from an existing secret or is provided via `.Values`
         {{- $domain2 := printf "%s.%s.svc.%s" (include "nr-ebpf-agent.service.name" .) $.Release.Namespace $.Values.kubernetesClusterDomain }}
         {{- $domain3 := printf "%s.%s.svc"  (include "otel-collector.service.name" .) $.Release.Namespace }}
         {{- $domain4 := printf "%s.%s.svc.%s" (include "otel-collector.service.name" .) $.Release.Namespace $.Values.kubernetesClusterDomain }}
-        {{- $domains := list $domain1 $domain2 $domain3 $domain4 }}
+        {{- $domain5 := "localhost" }}
+        {{- $domains := list $domain1 $domain2 $domain3 $domain4 $domain5 }}
         {{- $cert := genSignedCert (include "newrelic.common.naming.fullname" .) nil $domains $certValidity $ca }}
         {{- $clientCert = b64enc $cert.Cert }}
         {{- $clientKey = b64enc $cert.Key }}

charts/nr-ebpf-agent/values.yaml

@@ -10,7 +10,7 @@ customSecretLicenseKey: ""
 # -- If using a customSecretLicenseKey, you must supply your region "US"/"EU". Otherwise, leave this value as an empty string.
 region: ""
 # -- Enable to export data to NR's Staging otel endpoint (staging-otlp.nr-data.net:4317).
-nrStaging: false
+nrStaging:
 # -- Configures the agent to send all data through the proxy specified via the otel collector.
 proxy: ""
 # -- Drop data when service names map to an IP address.
@@ -103,7 +103,7 @@ ebpfAgent:
     # -- The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is also set to Always.
     pullPolicy: IfNotPresent
     # -- The tag of the eBPF agent image to be deployed.
-    tag: agent-nr-ebpf-agent_0.0.7
+    tag: agent-nr-ebpf-agent_0.0.8
   resources:
     limits:
       # -- Max memory allocated to the container.
@@ -132,7 +132,7 @@ ebpfClient:
     # -- The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is set to Always.
     pullPolicy: IfNotPresent
     # -- The tag of the eBPF client image to be deployed.
-    tag: client-nr-ebpf-client_0.0.11
+    tag: client-nr-ebpf-client_0.0.12
   resources:
     limits:
       # -- Max memory allocated to the container.

charts/synthetics-job-manager/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: synthetics-job-manager
 description: New Relic Synthetics Containerized Job Manager
 type: application
-version: 3.0.7
-appVersion: release-424
+version: 3.0.8
+appVersion: release-428
 home: https://github.com/orgs/newrelic/teams/proactive-monitoring
 maintainers:
   - name: kaschaefer-nr
@@ -17,6 +17,7 @@ maintainers:
   - name: schakraborty-nr
   - name: shashank-srirangam
   - name: nr-mdadhich
+  - name: nr-amrendrasingh
     email: [email protected]
 keywords:
   - synthetics
@@ -31,5 +32,5 @@ dependencies:
     version: 1.0.38
     condition: node-api-runtime.enabled
   - name: node-browser-runtime
-    version: 2.0.4
+    version: 2.0.5
     condition: node-browser-runtime.enabled

charts/synthetics-job-manager/charts/node-browser-runtime/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: node-browser-runtime
 description: New Relic Synthetics Browser Runtime
 type: application
-version: 2.0.4
-appVersion: 3.0.17
+version: 2.0.5
+appVersion: 3.0.24
 home: https://github.com/orgs/newrelic/teams/proactive-monitoring
 maintainers:
   - name: Philip-R-Beckwith