diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdcbc47c0068312b1d72e3d9df02358d0fe8b837..6be722fb1dee322c08a96e22e9c5d1ffcfd114f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ image: docker:24 build: + except: + - base-common stage: build needs: [] before_script: @@ -30,6 +32,8 @@ build: .deploy: + except: + - base-common stage: deploy needs: - "build" @@ -41,23 +45,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}/ @@ -101,6 +105,8 @@ deploy-example: delete-example: + except: + - base-common stage: deploy needs: [] when: manual @@ -120,6 +126,8 @@ delete-example: .log-fetcher: + except: + - base-common stage: deploy needs: [] when: manual @@ -158,6 +166,8 @@ log-fetcher-in-dev: .upload-from-fex-to-somewhere: + except: + - base-common stage: deploy needs: [] when: manual diff --git a/chart/Chart.yaml b/chart/Chart.yaml index c5e47b941e7064a2287f70611c8d910e81fd1124..ca345f41e58bb0ca8d3648f8b4b5f01e8a087b5c 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 ce3e74cde1f57c79624a553eee237108b06877d2..140eee49b55b613f0f309596f9b825a35eac35b8 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 7fd7fd1030bf1b6b21a51992a40f3c3cce1e1cc2..44a73f1cac74cd0eec3abcd7a2a8a27059876e1a 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}/