Skip to content
Snippets Groups Projects
Commit 2ea75ce3 authored by Bryan BRANCOTTE's avatar Bryan BRANCOTTE
Browse files

Merge branch 'rename-helm-package' into 'base-common'

helm package have been renamed

See merge request !5
parents 5f04ac75 b172eb43
No related branches found
No related tags found
1 merge request!5helm package have been renamed
Pipeline #132623 skipped
...@@ -43,23 +43,23 @@ build: ...@@ -43,23 +43,23 @@ build:
- > - >
echo "helm upgrade --install --namespace=${NAMESPACE} echo "helm upgrade --install --namespace=${NAMESPACE}
--render-subchart-notes --render-subchart-notes
--set shiny-server.ingress.className=${INGRESS_CLASS} --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS}
--set shiny-server.ingress.hostname=${PUBLIC_URL} --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL}
--set shiny-server.imageFullNameAndTag=${IMAGE} --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE}
--set shiny-server.registry.username=${DEPLOY_USER} --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER}
--set shiny-server.registry.password=xxxx --set shiny-k8s-toolkit-helm.registry.password=xxxx
--set shiny-server.registry.host=${CI_REGISTRY} --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY}
--values ./${CHART_LOCATION}/${VALUES_OVERRIDE_FILENAME:-values.yaml} --values ./${CHART_LOCATION}/${VALUES_OVERRIDE_FILENAME:-values.yaml}
${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/" ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/"
- > - >
helm upgrade --install --namespace=${NAMESPACE} helm upgrade --install --namespace=${NAMESPACE}
--render-subchart-notes --render-subchart-notes
--set shiny-server.ingress.className=${INGRESS_CLASS} --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS}
--set shiny-server.ingress.hostname=${PUBLIC_URL} --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL}
--set shiny-server.imageFullNameAndTag=${IMAGE} --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE}
--set shiny-server.registry.username=${DEPLOY_USER} --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER}
--set shiny-server.registry.password=${DEPLOY_TOKEN} --set shiny-k8s-toolkit-helm.registry.password=${DEPLOY_TOKEN}
--set shiny-server.registry.host=${CI_REGISTRY} --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY}
--values ./${CHART_LOCATION}/${VALUES_OVERRIDE_FILENAME:-values.yaml} --values ./${CHART_LOCATION}/${VALUES_OVERRIDE_FILENAME:-values.yaml}
${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/ ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/
......
...@@ -24,6 +24,6 @@ version: 1.0.0 ...@@ -24,6 +24,6 @@ version: 1.0.0
appVersion: "1.0.0" appVersion: "1.0.0"
dependencies: dependencies:
- name: shiny-server - name: shiny-k8s-toolkit-helm
version: "*" version: "*"
repository: "https://gitlab.pasteur.fr/api/v4/projects/5334/packages/helm/stable" repository: "https://gitlab.pasteur.fr/api/v4/projects/5334/packages/helm/stable"
shiny-server: shiny-k8s-toolkit-helm:
autoscaling: autoscaling:
enabled: false enabled: false
nodowntime: nodowntime:
......
...@@ -21,10 +21,10 @@ export ACTION="template --debug" ...@@ -21,10 +21,10 @@ export ACTION="template --debug"
helm ${ACTION} --namespace=${NAMESPACE} \ helm ${ACTION} --namespace=${NAMESPACE} \
--render-subchart-notes \ --render-subchart-notes \
--set shiny-server.ingress.className=${INGRESS_CLASS} \ --set shiny-k8s-toolkit-helm.ingress.className=${INGRESS_CLASS} \
--set shiny-server.ingress.hostname=${PUBLIC_URL} \ --set shiny-k8s-toolkit-helm.ingress.hostname=${PUBLIC_URL} \
--set shiny-server.imageFullNameAndTag=${IMAGE} \ --set shiny-k8s-toolkit-helm.imageFullNameAndTag=${IMAGE} \
--set shiny-server.registry.username=${DEPLOY_USER} \ --set shiny-k8s-toolkit-helm.registry.username=${DEPLOY_USER} \
--set shiny-server.registry.password=${DEPLOY_TOKEN} \ --set shiny-k8s-toolkit-helm.registry.password=${DEPLOY_TOKEN} \
--set shiny-server.registry.host=${CI_REGISTRY} \ --set shiny-k8s-toolkit-helm.registry.host=${CI_REGISTRY} \
${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/ ${CI_COMMIT_REF_SLUG}-${CHART_LOCATION} ./${CHART_LOCATION}/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment