Merge branch 'master' into burhan/otel-collector-removal

kkhandelwal-nr · web-flow · commit 7ae9da8fdda9 · 2025-12-02T17:42:19.000+05:30
diff --git a/.github/workflows/check-generated-files.yaml b/.github/workflows/check-generated-files.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v4
         with:
-          version: v3.12.0
+          version: 'v3.19.2'
 
       - name: Add Helm repositories
         run: |
diff --git a/.github/workflows/lint_test_charts.yaml b/.github/workflows/lint_test_charts.yaml
@@ -32,7 +32,7 @@ jobs:
       - uses: helm/chart-testing-action@v2.8.0
       - uses: azure/setup-helm@v4
         with:
-          version: 'v3.2.0'
+          version: 'v3.19.2'
 
       - name: Set up helm-unittest
         run: helm plugin install https://github.com/helm-unittest/helm-unittest
@@ -76,13 +76,13 @@ jobs:
       - uses: helm/chart-testing-action@v2.8.0
       - uses: azure/setup-helm@v4
         with:
-          version: 'v3.2.0'
+          version: 'v3.19.2'
 
       - name: Install Minikube
         uses: manusa/actions-setup-minikube@v2.14.0
         with:
-          minikube version: v1.37.0
-          kubernetes version: v1.34.0
+          minikube version: 'v1.37.0'
+          kubernetes version: 'v1.34.0'
           github token: ${{ secrets.GITHUB_TOKEN }}
           driver: docker
           start args: "--container-runtime=containerd"
@@ -109,7 +109,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: azure/setup-helm@v4
         with:
-          version: 'v3.2.0'
+          version: 'v3.19.2'
 
       - name: Add helm repositories
         run: |
@@ -157,7 +157,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: azure/setup-helm@v4
         with:
-          version: 'v3.2.0'
+          version: 'v3.19.2'
 
       - name: Add helm repositories
         run: |
diff --git a/charts/nr-k8s-otel-collector/Chart.yaml b/charts/nr-k8s-otel-collector/Chart.yaml
@@ -17,7 +17,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.9.5
+version: 0.9.6
 
 
 dependencies:
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 rules:
   - apiGroups:
     - ""
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 subjects:
   - kind: ServiceAccount
     name: nr-k8s-otel-collector
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 data:
   daemonset-config.yaml: |
     receivers:
@@ -605,7 +605,7 @@ data:
             value: <cluser_name>
           - key: "newrelic.chart.version"
             action: upsert
-            value: 0.9.5
+            value: 0.9.6
           - key: newrelic.entity.type
             action: upsert
             value: "k8s"
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 spec:
   selector:
     matchLabels:
@@ -24,7 +24,7 @@ spec:
         app.kubernetes.io/name: nr-k8s-otel-collector
         component: daemonset
       annotations:
-        checksum/config: 77a7cce06c82557a2dd736d5097decdee255f98396c867accc2a38a2f3296a41
+        checksum/config: 6c393dbeeeb8b55c3da8659d412cfe48444e0047f0988787e14afd0292e00dc4
     spec:
       serviceAccountName: nr-k8s-otel-collector
       initContainers:
@@ -93,7 +93,7 @@ spec:
             - --config
             - /config/daemonset-config.yaml
             - --feature-gates
-            - receiver.kubeletstats.enableCPUUsageMetrics,metricsgeneration.MatchAttributes
+            - metricsgeneration.MatchAttributes
           resources:
             {}
           env:
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 data:
   deployment-config.yaml: |
     receivers:
@@ -516,7 +516,7 @@ data:
             value: <cluser_name>
           - key: "newrelic.chart.version"
             action: upsert
-            value: 0.9.5
+            value: 0.9.6
           - key: newrelic.entity.type
             action: upsert
             value: "k8s"
@@ -534,7 +534,7 @@ data:
             value: <cluser_name>
           - key: "newrelic.chart.version"
             action: upsert
-            value: 0.9.5
+            value: 0.9.6
 
       transform/events:
         log_statements:
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 spec:
   replicas: 1
   minReadySeconds: 5
@@ -26,7 +26,7 @@ spec:
         app.kubernetes.io/name: nr-k8s-otel-collector
         component: deployment
       annotations:
-        checksum/config: 7b6cdd6a106ad25744cf25c3f834de76923083f2c466a19cf906d777976b2322
+        checksum/config: ca6b21baf629a91df39d33fe47590c1664987620a0efb9c0f2c797c8a3fb5dd1
     spec:
       serviceAccountName: nr-k8s-otel-collector
       containers:
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml
@@ -10,6 +10,6 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 data:
   licenseKey: PE5SX2xpY2Vuc2VLZXk+
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
 spec:
   type: ClusterIP
   ports:
diff --git a/charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml b/charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml
@@ -10,5 +10,5 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: nr-k8s-otel-collector
     app.kubernetes.io/version: 1.2.0
-    helm.sh/chart: nr-k8s-otel-collector-0.9.5
+    helm.sh/chart: nr-k8s-otel-collector-0.9.6
   annotations:
diff --git a/charts/nr-k8s-otel-collector/templates/_args.tpl b/charts/nr-k8s-otel-collector/templates/_args.tpl
@@ -14,7 +14,7 @@ A helper to return the args to pass into the deployment.
 A helper to return the args to pass into the daemonset.
 */ -}}
 {{- define "nrKubernetesOtel.daemonset.args" -}}
-{{- $defaultDaemonsetArgs := list "--config" "/config/daemonset-config.yaml" "--feature-gates" "receiver.kubeletstats.enableCPUUsageMetrics,metricsgeneration.MatchAttributes" }}
+{{- $defaultDaemonsetArgs := list "--config" "/config/daemonset-config.yaml" "--feature-gates" "metricsgeneration.MatchAttributes" }}
 {{- if .Values.daemonset.extraArgs -}}
     {{- toYaml (concat $defaultDaemonsetArgs .Values.daemonset.extraArgs) }}
 {{- else -}}
diff --git a/charts/nr-k8s-otel-collector/tests/args_test.yaml b/charts/nr-k8s-otel-collector/tests/args_test.yaml
@@ -19,7 +19,7 @@ tests:
         template: templates/deployment.yaml
       - equal:
           path: spec.template.spec.containers[0].args
-          value: [ "--config", "/config/daemonset-config.yaml", "--feature-gates", "receiver.kubeletstats.enableCPUUsageMetrics,metricsgeneration.MatchAttributes" ]
+          value: [ "--config", "/config/daemonset-config.yaml", "--feature-gates", "metricsgeneration.MatchAttributes" ]
         template: templates/daemonset.yaml
   - it: has default args and extra args in deployment
     set:
@@ -41,5 +41,5 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].args
-          value: [ "--config", "/config/daemonset-config.yaml", "--feature-gates", "receiver.kubeletstats.enableCPUUsageMetrics,metricsgeneration.MatchAttributes", "--some-dae-param", "dae1" ]
+          value: [ "--config", "/config/daemonset-config.yaml", "--feature-gates", "metricsgeneration.MatchAttributes", "--some-dae-param", "dae1" ]
         template: templates/daemonset.yaml
diff --git a/charts/nri-bundle/Chart.lock b/charts/nri-bundle/Chart.lock
@@ -1,25 +1,25 @@
 dependencies:
 - name: newrelic-infrastructure
   repository: https://newrelic.github.io/nri-kubernetes
-  version: 3.55.1
+  version: 3.55.2
 - name: nri-prometheus
   repository: https://newrelic.github.io/nri-prometheus
   version: 2.1.21
 - name: newrelic-prometheus-agent
   repository: https://newrelic.github.io/newrelic-prometheus-configurator
-  version: 2.4.1
+  version: 2.4.2
 - name: nri-metadata-injection
   repository: https://newrelic.github.io/k8s-metadata-injection
-  version: 4.30.1
+  version: 4.31.0
 - name: newrelic-k8s-metrics-adapter
   repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
-  version: 1.17.2
+  version: 1.17.3
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
   version: 6.1.5
 - name: nri-kube-events
   repository: https://newrelic.github.io/nri-kube-events
-  version: 3.16.1
+  version: 3.16.2
 - name: newrelic-logging
   repository: https://newrelic.github.io/helm-charts
   version: 1.31.0
@@ -31,12 +31,12 @@ dependencies:
   version: 0.5.0
 - name: k8s-agents-operator
   repository: https://newrelic.github.io/k8s-agents-operator
-  version: 0.32.2
+  version: 0.32.3
 - name: pixie-operator-chart
   repository: https://pixie-operator-charts.storage.googleapis.com
   version: 0.1.7
 - name: newrelic-infra-operator
   repository: https://newrelic.github.io/newrelic-infra-operator
-  version: 2.18.0
-digest: sha256:2cfcd2b7d0e1889a4118fbe469d5487b078e80b3fcd3e8faab5928b238c70e7c
-generated: "2025-11-18T13:21:18.541829931Z"
+  version: 2.18.1
+digest: sha256:aa9b63579f1205c74952d570ebda1ebf9d8a574804fa0599d6a4133f271f8e97
+generated: "2025-11-24T14:53:30.361628026Z"
diff --git a/charts/nri-bundle/Chart.yaml b/charts/nri-bundle/Chart.yaml
@@ -18,13 +18,13 @@ sources:
   - https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator
   - https://github.com/newrelic/k8s-agents-operator/tree/master/charts/k8s-agents-operator
 
-version: 6.0.25
+version: 6.0.26
 
 dependencies:
   - name: newrelic-infrastructure
     repository: https://newrelic.github.io/nri-kubernetes
     condition: infrastructure.enabled,newrelic-infrastructure.enabled
-    version: 3.55.1
+    version: 3.55.2
 
   - name: nri-prometheus
     repository: https://newrelic.github.io/nri-prometheus
@@ -34,17 +34,17 @@ dependencies:
   - name: newrelic-prometheus-agent
     repository: https://newrelic.github.io/newrelic-prometheus-configurator
     condition: newrelic-prometheus-agent.enabled
-    version: 2.4.1
+    version: 2.4.2
 
   - name: nri-metadata-injection
     repository: https://newrelic.github.io/k8s-metadata-injection
     condition: webhook.enabled,nri-metadata-injection.enabled
-    version: 4.30.1
+    version: 4.31.0
 
   - name: newrelic-k8s-metrics-adapter
     repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
     condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled
-    version: 1.17.2
+    version: 1.17.3
 
   - name: kube-state-metrics
     version: 6.1.5
@@ -54,7 +54,7 @@ dependencies:
   - name: nri-kube-events
     repository: https://newrelic.github.io/nri-kube-events
     condition: kubeEvents.enabled,nri-kube-events.enabled
-    version: 3.16.1
+    version: 3.16.2
 
   - name: newrelic-logging
     repository: https://newrelic.github.io/helm-charts
@@ -74,7 +74,7 @@ dependencies:
   - name: k8s-agents-operator
     repository: https://newrelic.github.io/k8s-agents-operator
     condition: k8s-agents-operator.enabled
-    version: 0.32.2
+    version: 0.32.3
 
   # Keep the version of pixie-operator-chart in sync with the CRD versions for
   # olm_crd.yaml and px.dev_viziers.yaml in
@@ -88,7 +88,7 @@ dependencies:
   - name: newrelic-infra-operator
     repository: https://newrelic.github.io/newrelic-infra-operator
     condition: newrelic-infra-operator.enabled
-    version: 2.18.0
+    version: 2.18.1
 
 maintainers:
   - name: Philip-R-Beckwith
