From b172eb435f95804ca759c09f8accfeb44cc3389c Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Thu, 13 Jun 2024 15:20:11 +0200
Subject: [PATCH] helm package have been renamed

---
 .gitlab-ci.yml    | 24 ++++++++++++------------
 chart/Chart.yaml  |  2 +-
 chart/values.yaml |  2 +-
 dohelm.sh         | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0344cfb..8da33d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,23 +43,23 @@ build:
     - >
       echo "helm upgrade --install --namespace=${NAMESPACE}
       --render-subchart-notes
-      --set shiny-server.ingress.className=${INGRESS_CLASS}
-      --set shiny-server.ingress.hostname=${PUBLIC_URL}
-      --set shiny-server.imageFullNameAndTag=${IMAGE}
-      --set shiny-server.registry.username=${DEPLOY_USER}
-      --set shiny-server.registry.password=xxxx
-      --set shiny-server.registry.host=${CI_REGISTRY}
+      --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS}
+      --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL}
+      --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE}
+      --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER}
+      --set shiny-k8s-toolkit-helm.registry.password=xxxx
+      --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY}
       --values ./${CHART_LOCATION}/${VALUES_OVERRIDE_FILENAME:-values.yaml}
       ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/"
     - >
       helm upgrade --install --namespace=${NAMESPACE}
       --render-subchart-notes
-      --set shiny-server.ingress.className=${INGRESS_CLASS}
-      --set shiny-server.ingress.hostname=${PUBLIC_URL}
-      --set shiny-server.imageFullNameAndTag=${IMAGE}
-      --set shiny-server.registry.username=${DEPLOY_USER}
-      --set shiny-server.registry.password=${DEPLOY_TOKEN}
-      --set shiny-server.registry.host=${CI_REGISTRY}
+      --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS}
+      --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL}
+      --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE}
+      --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER}
+      --set shiny-k8s-toolkit-helm.registry.password=${DEPLOY_TOKEN}
+      --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY}
       --values ./${CHART_LOCATION}/${VALUES_OVERRIDE_FILENAME:-values.yaml}
       ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/
 
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index c5e47b9..ca345f4 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -24,6 +24,6 @@ version: 1.0.0
 appVersion: "1.0.0"
 
 dependencies:
-- name: shiny-server
+- name: shiny-k8s-toolkit-helm
   version: "*"
   repository: "https://gitlab.pasteur.fr/api/v4/projects/5334/packages/helm/stable"
diff --git a/chart/values.yaml b/chart/values.yaml
index ce3e74c..140eee4 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,4 +1,4 @@
-shiny-server:
+shiny-k8s-toolkit-helm:
   autoscaling:
     enabled: false
   nodowntime:
diff --git a/dohelm.sh b/dohelm.sh
index 7fd7fd1..44a73f1 100755
--- a/dohelm.sh
+++ b/dohelm.sh
@@ -21,10 +21,10 @@ export ACTION="template --debug"
 
 helm ${ACTION} --namespace=${NAMESPACE} \
     --render-subchart-notes \
-    --set shiny-server.ingress.className=${INGRESS_CLASS} \
-    --set shiny-server.ingress.hostname=${PUBLIC_URL} \
-    --set shiny-server.imageFullNameAndTag=${IMAGE} \
-    --set shiny-server.registry.username=${DEPLOY_USER} \
-    --set shiny-server.registry.password=${DEPLOY_TOKEN} \
-    --set shiny-server.registry.host=${CI_REGISTRY} \
+    --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS} \
+    --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL} \
+    --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE} \
+    --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER} \
+    --set shiny-k8s-toolkit-helm.registry.password=${DEPLOY_TOKEN} \
+    --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY} \
     ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/
-- 
GitLab