From f64bcfc62cf82610df0d13d31ff461fa1c5c3a30 Mon Sep 17 00:00:00 2001
From: PaoloGallina <paologallina1992@gmail.com>
Date: Mon, 15 Jul 2024 15:47:50 +0200
Subject: [PATCH] feat(chart): updated chart (#491)

* feat(chart): updated chart
---
 .github/workflows/push_pr.yml                   |  7 +++----
 charts/nri-prometheus/Chart.lock                |  6 +++---
 charts/nri-prometheus/Chart.yaml                | 12 +++---------
 charts/nri-prometheus/templates/deployment.yaml |  2 --
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 772683b3..2bc7080e 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -51,7 +51,7 @@ jobs:
         uses: manusa/actions-setup-minikube@v2.11.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
-          minikube version: v1.30.1
+          minikube version: v1.33.1
           driver: docker
           kubernetes version: ${{ matrix.kubernetes-version }}
           github token: ${{ secrets.GITHUB_TOKEN }}
@@ -66,13 +66,12 @@ jobs:
           sudo cp ./dist/nri-prometheus-nix_linux_amd64/nri-prometheus ./bin/nri-prometheus
           DOCKER_BUILDKIT=1 docker build -t e2e/nri-prometheus:test  . -f Dockerfile.dev
           minikube image load e2e/nri-prometheus:test
-          kubectl create ns ct
       - name: Test install charts
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --namespace ct --config .github/ct.yaml --debug
+        run: ct install --config .github/ct.yaml --debug
       - name: Test upgrade charts
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --namespace ct --config .github/ct.yaml --debug --upgrade
+        run: ct install --config .github/ct.yaml --debug --upgrade
 
   static-analysis:
     name: Run all static analysis checks
diff --git a/charts/nri-prometheus/Chart.lock b/charts/nri-prometheus/Chart.lock
index d3d13d8c..13fed1c8 100644
--- a/charts/nri-prometheus/Chart.lock
+++ b/charts/nri-prometheus/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common-library
   repository: https://helm-charts.newrelic.com
-  version: 1.1.1
-digest: sha256:3c9053021f3c22aa3cdfc6781d3498bcbedb0b973af9121b1722469744fb5162
-generated: "2023-03-15T19:11:26.516216315Z"
+  version: 1.2.0
+digest: sha256:fa87cb007564a39a72739a3e850a91d6b03c0fc27a1115deac042b3ef77b4142
+generated: "2024-07-15T13:04:29.3144+02:00"
diff --git a/charts/nri-prometheus/Chart.yaml b/charts/nri-prometheus/Chart.yaml
index 8dc92202..1511f202 100644
--- a/charts/nri-prometheus/Chart.yaml
+++ b/charts/nri-prometheus/Chart.yaml
@@ -7,31 +7,25 @@ sources:
   - https://github.com/newrelic/nri-prometheus
   - https://github.com/newrelic/nri-prometheus/tree/main/charts/nri-prometheus
 
-version: 2.1.17
-appVersion: 2.18.4
+version: 2.1.18
+appVersion: 2.21.4
 
 dependencies:
   - name: common-library
-    version: 1.1.1
+    version: 1.2.0
     repository: "https://helm-charts.newrelic.com"
 
 maintainers:
   - name: alvarocabanas
     url: https://github.com/alvarocabanas
-  - name: carlossscastro
-    url: https://github.com/carlossscastro
   - name: sigilioso
     url: https://github.com/sigilioso
   - name: gsanchezgavier
     url: https://github.com/gsanchezgavier
   - name: kang-makes
     url: https://github.com/kang-makes
-  - name: marcsanmi
-    url: https://github.com/marcsanmi
   - name: paologallinaharbur
     url: https://github.com/paologallinaharbur
-  - name: roobre
-    url: https://github.com/roobre
 
 keywords:
   - prometheus
diff --git a/charts/nri-prometheus/templates/deployment.yaml b/charts/nri-prometheus/templates/deployment.yaml
index b8a9011a..8529b71f 100644
--- a/charts/nri-prometheus/templates/deployment.yaml
+++ b/charts/nri-prometheus/templates/deployment.yaml
@@ -71,10 +71,8 @@ spec:
             value: "/var/run/secrets/kubernetes.io/serviceaccount/token"
           - name: "CA_FILE"
             value: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-        {{- if .Values.resources }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
-        {{- end }}
       volumes:
         - name: config-volume
           configMap: