From c739e248b8e7521e94b21c881834aa753b94867a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20J=C4=99drzejewski?=
 <mateusz.jedrzejewski@yahoo.pl>
Date: Thu, 17 Oct 2024 17:19:34 +0200
Subject: [PATCH 1/2] renaming and gitignore change

---
 .github/workflows/chart-releaser.yaml                  | 10 ++++++----
 .gitignore                                             |  3 ++-
 {helm-chart => charts/jrpc-interceptor}/Chart.yaml     |  0
 .../jrpc-interceptor}/templates/_helpers.tpl           |  0
 .../jrpc-interceptor}/templates/deployment.yaml        |  0
 .../jrpc-interceptor}/templates/service.yaml           |  0
 .../jrpc-interceptor}/templates/servicemonitor.yaml    |  0
 {helm-chart => charts/jrpc-interceptor}/values.yaml    |  0
 8 files changed, 8 insertions(+), 5 deletions(-)
 rename {helm-chart => charts/jrpc-interceptor}/Chart.yaml (100%)
 rename {helm-chart => charts/jrpc-interceptor}/templates/_helpers.tpl (100%)
 rename {helm-chart => charts/jrpc-interceptor}/templates/deployment.yaml (100%)
 rename {helm-chart => charts/jrpc-interceptor}/templates/service.yaml (100%)
 rename {helm-chart => charts/jrpc-interceptor}/templates/servicemonitor.yaml (100%)
 rename {helm-chart => charts/jrpc-interceptor}/values.yaml (100%)

diff --git a/.github/workflows/chart-releaser.yaml b/.github/workflows/chart-releaser.yaml
index 0038572..25e5edb 100644
--- a/.github/workflows/chart-releaser.yaml
+++ b/.github/workflows/chart-releaser.yaml
@@ -29,12 +29,14 @@ jobs:
 
       - name: Helm Dependencies
         run: |
-          helm dependency update helm-chart
+          for dir in charts/*; do
+            helm dependency update "$dir";
+          done
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@main
         with:
-          charts_dir: helm-chart
+          charts_dir: charts
           pages_branch: charts-releases
           skip_upload: true
         env:
@@ -45,7 +47,7 @@ jobs:
       - name: Publish to JFrog Artifactory
         shell: bash
         run: |
-          helm registry login nethermind.jfrog.io --username ${{ secrets.ARTIFACTORY_ANGKOR_USERNAME }} --password ${{ secrets.ARTIFACTORY_ANGKOR_TOKEN_DEVELOPER }}
+          helm registry login nethermind.jfrog.io --username ${{ secrets.ARTIFACTORY_ANGKOR_USERNAME }} --password ${{ secrets.ARTIFACTORY_ANGKOR_TOKEN_CONTRIBUTOR }}
           for chart in .cr-release-packages/*.tgz; do
             helm push "$chart" oci://nethermind.jfrog.io/angkor-helmoci-local
-          done
+          done
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 824d287..cdb1577 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ go.work.sum
 .DS_Store
 .lh/
 .vscode/
-jrpc-interceptor
\ No newline at end of file
+/jrpc-interceptor
+!jrpc-interceptor/
\ No newline at end of file
diff --git a/helm-chart/Chart.yaml b/charts/jrpc-interceptor/Chart.yaml
similarity index 100%
rename from helm-chart/Chart.yaml
rename to charts/jrpc-interceptor/Chart.yaml
diff --git a/helm-chart/templates/_helpers.tpl b/charts/jrpc-interceptor/templates/_helpers.tpl
similarity index 100%
rename from helm-chart/templates/_helpers.tpl
rename to charts/jrpc-interceptor/templates/_helpers.tpl
diff --git a/helm-chart/templates/deployment.yaml b/charts/jrpc-interceptor/templates/deployment.yaml
similarity index 100%
rename from helm-chart/templates/deployment.yaml
rename to charts/jrpc-interceptor/templates/deployment.yaml
diff --git a/helm-chart/templates/service.yaml b/charts/jrpc-interceptor/templates/service.yaml
similarity index 100%
rename from helm-chart/templates/service.yaml
rename to charts/jrpc-interceptor/templates/service.yaml
diff --git a/helm-chart/templates/servicemonitor.yaml b/charts/jrpc-interceptor/templates/servicemonitor.yaml
similarity index 100%
rename from helm-chart/templates/servicemonitor.yaml
rename to charts/jrpc-interceptor/templates/servicemonitor.yaml
diff --git a/helm-chart/values.yaml b/charts/jrpc-interceptor/values.yaml
similarity index 100%
rename from helm-chart/values.yaml
rename to charts/jrpc-interceptor/values.yaml

From a37e3eb05f535acbbed3a67751d8e06538c236a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20J=C4=99drzejewski?=
 <mateusz.jedrzejewski@yahoo.pl>
Date: Thu, 17 Oct 2024 17:20:25 +0200
Subject: [PATCH 2/2] use developer secret

---
 .github/workflows/chart-releaser.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/chart-releaser.yaml b/.github/workflows/chart-releaser.yaml
index 25e5edb..894513f 100644
--- a/.github/workflows/chart-releaser.yaml
+++ b/.github/workflows/chart-releaser.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Publish to JFrog Artifactory
         shell: bash
         run: |
-          helm registry login nethermind.jfrog.io --username ${{ secrets.ARTIFACTORY_ANGKOR_USERNAME }} --password ${{ secrets.ARTIFACTORY_ANGKOR_TOKEN_CONTRIBUTOR }}
+          helm registry login nethermind.jfrog.io --username ${{ secrets.ARTIFACTORY_ANGKOR_USERNAME }} --password ${{ secrets.ARTIFACTORY_ANGKOR_TOKEN_DEVELOPER }}
           for chart in .cr-release-packages/*.tgz; do
             helm push "$chart" oci://nethermind.jfrog.io/angkor-helmoci-local
           done
\ No newline at end of file