diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04bd880e73053e59d5eefefa84c175155f71bb69..8384dd7c261db1d952460b22bb0d25032ad2c0d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ upload: needs: [] image: harbor.pasteur.fr/kube-system/helm-kubectl:3.4.0 script: - - CHART_VERSION=$(helm show chart shiny-server-hosting | grep version | cut -d' ' -f2) - - CHART_NAME=$(helm show chart shiny-server-hosting | grep name | cut -d' ' -f2) + - CHART_VERSION=$(helm show chart shiny-server | grep version | cut -d' ' -f2) + - CHART_NAME=$(helm show chart shiny-server | grep name | cut -d' ' -f2) - | if [ "helm" == "${CI_COMMIT_REF_SLUG}" ]; then export CHANNEL="stable" @@ -14,7 +14,7 @@ upload: export CHANNEL="${CI_COMMIT_REF_SLUG}" fi echo $CHANNEL - - helm package shiny-server-hosting + - helm package shiny-server - curl --request POST --user gitlab-ci-token:$CI_JOB_TOKEN --form "chart=@${CHART_NAME}-${CHART_VERSION}.tgz" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/${CHANNEL}/charts" diff --git a/shiny-server-hosting/.helmignore b/shiny-server/.helmignore similarity index 100% rename from shiny-server-hosting/.helmignore rename to shiny-server/.helmignore diff --git a/shiny-server-hosting/Chart.yaml b/shiny-server/Chart.yaml similarity index 91% rename from shiny-server-hosting/Chart.yaml rename to shiny-server/Chart.yaml index 685bdeb40dc885ab6b0c4509c4e8e80da0c9ea57..284b1b5cd2b0d440c428c1c74bc808d0ffa1a293 100644 --- a/shiny-server-hosting/Chart.yaml +++ b/shiny-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -name: rshiny -description: A Helm chart for deploying rshiny app in Kubernetes +name: shiny-server +description: A Helm chart for deploying shiny app in Kubernetes # A chart can be either an 'application' or a 'library' chart. # @@ -15,7 +15,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.4.2 +version: 0.4.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/shiny-server-hosting/templates/NOTES.txt b/shiny-server/templates/NOTES.txt similarity index 100% rename from shiny-server-hosting/templates/NOTES.txt rename to shiny-server/templates/NOTES.txt diff --git a/shiny-server-hosting/templates/_helpers.tpl b/shiny-server/templates/_helpers.tpl similarity index 100% rename from shiny-server-hosting/templates/_helpers.tpl rename to shiny-server/templates/_helpers.tpl diff --git a/shiny-server-hosting/templates/_secretHelper.tpl b/shiny-server/templates/_secretHelper.tpl similarity index 100% rename from shiny-server-hosting/templates/_secretHelper.tpl rename to shiny-server/templates/_secretHelper.tpl diff --git a/shiny-server-hosting/templates/deployment.yaml b/shiny-server/templates/deployment.yaml similarity index 100% rename from shiny-server-hosting/templates/deployment.yaml rename to shiny-server/templates/deployment.yaml diff --git a/shiny-server-hosting/templates/hpa.yaml b/shiny-server/templates/hpa.yaml similarity index 100% rename from shiny-server-hosting/templates/hpa.yaml rename to shiny-server/templates/hpa.yaml diff --git a/shiny-server-hosting/templates/image-pull-secret.yaml b/shiny-server/templates/image-pull-secret.yaml similarity index 100% rename from shiny-server-hosting/templates/image-pull-secret.yaml rename to shiny-server/templates/image-pull-secret.yaml diff --git a/shiny-server-hosting/templates/ingress.yaml b/shiny-server/templates/ingress.yaml similarity index 100% rename from shiny-server-hosting/templates/ingress.yaml rename to shiny-server/templates/ingress.yaml diff --git a/shiny-server-hosting/templates/service.yaml b/shiny-server/templates/service.yaml similarity index 100% rename from shiny-server-hosting/templates/service.yaml rename to shiny-server/templates/service.yaml diff --git a/shiny-server-hosting/values.yaml b/shiny-server/values.yaml similarity index 100% rename from shiny-server-hosting/values.yaml rename to shiny-server/values.yaml