ini

.gitlab-ci.yml

@@ -32,7 +32,7 @@ deploy:
   variables:
     NAMESPACE: shiny
     RELEASE_NAME: ${CI_PROJECT_NAME}-${CI_PROJECT_ID}
-    HOST:  $RELEASE_NAME.k.cirrus.cloud.inrae.fr
+    HOST:  ${RELEASE_NAME}.k.cirrus.cloud.inrae.fr
     TLS_SECRET: rshiny-k-cirrus-cloud-inrae-fr-tls # this tls secret is valid for domainame *.k.cirrus.cloud.inrae.fr in shiny namespace
   before_script:
     - ''
@@ -41,6 +41,8 @@ deploy:
     - helm create rshiny
     - 'sed -ri "s/^(\s*)(containerPort\s*:\s*80\s*$)/\1containerPort: 3838/" rshiny/templates/deployment.yaml'
     - 'sed -ri "s/^(\s*)(targetPort\s*:\s*http\s*$)/\1targetPort: 3838/" rshiny/templates/service.yaml'
-    - helm upgrade --namespace shiny --install rshiny-1 --set image.repository=rocker/shiny --set image.tag="3.6.1" --set serviceAccount.create=false --set serviceAccount.name=rshiny --set ingress.enabled=true --set ingress.hosts[0].host=rshiny-1.k.cirrus.cloud.inrae.fr --set ingress.hosts[0].paths[0].path="/" --set ingress.tls[0].secretName=rshiny-k-cirrus-cloud-inrae-fr-tls --set ingress.tls[0].hosts[0]=rshiny-1.k.cirrus.cloud.inrae.fr ./rshiny
+      #- helm upgrade --namespace shiny --install rshiny-1 --set image.repository=rocker/shiny --set image.tag="3.6.1" --set serviceAccount.create=false --set serviceAccount.name=rshiny --set ingress.enabled=true --set ingress.hosts[0].host=rshiny-1.k.cirrus.cloud.inrae.fr --set ingress.hosts[0].paths[0].path="/" --set ingress.tls[0].secretName=rshiny-k-cirrus-cloud-inrae-fr-tls --set ingress.tls[0].hosts[0]=rshiny-1.k.cirrus.cloud.inrae.fr ./rshiny
+    - helm upgrade --namespace $NAMESPACE --install $RELEASE_NAME --set image.repository=rocker/shiny --set image.tag="3.6.1" --set serviceAccount.create=false --set serviceAccount.name=rshiny --set ingress.enabled=true --set ingress.hosts[0].host=$HOST --set ingress.hosts[0].paths[0].path="/" --set ingress.tls[0].secretName=$TLS_SECRET  --set ingress.tls[0].hosts[0]=$HOST ./rshiny
+
   after_script: 
      - 'echo "url to visit your application is https://rshiny-1.k.cirrus.cloud.inrae.fr"'