Moved webapp helm chart to main deploy directory.

destination-earth · Jan 9, 2025 · b85bac3 · b85bac3
1 parent d5546bd
commit b85bac3
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/deploy-webapp.yaml b/.github/workflows/deploy-webapp.yaml
@@ -56,7 +56,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./webapp
-          file: ./webapp/deploy/Dockerfile
+          file: ./webapp/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -68,14 +68,14 @@ jobs:
 
       - name: Update Helm dependencies
         run: |
-          helm dependency update ./webapp/deploy/helm
+          helm dependency update ./deploy/helm/webapp
 
       - name: Deploy to Kubernetes
         run: |
           helm upgrade --install \
             --namespace webapp \
             --create-namespace \
             webapp \
-            ./webapp/deploy/helm
+            ./deploy/helm/webapp
         env:
           KUBECONFIG: ${{ github.workspace }}/gfts-track-reconstruction/jupyterhub/secrets/kubeconfig.yaml
diff --git a/.prettierignore b/.prettierignore
@@ -1 +1 @@
-webapp/deploy/helm/
+deploy/helm/webapp
diff --git a/webapp/deploy/helm/.helmignore → deploy/helm/webapp/.helmignore b/webapp/deploy/helm/.helmignore → deploy/helm/webapp/.helmignore
diff --git a/webapp/deploy/helm/Chart.lock → deploy/helm/webapp/Chart.lock b/webapp/deploy/helm/Chart.lock → deploy/helm/webapp/Chart.lock
diff --git a/webapp/deploy/helm/Chart.yaml → deploy/helm/webapp/Chart.yaml b/webapp/deploy/helm/Chart.yaml → deploy/helm/webapp/Chart.yaml
diff --git a/webapp/deploy/helm/templates/NOTES.txt → deploy/helm/webapp/templates/NOTES.txt b/webapp/deploy/helm/templates/NOTES.txt → deploy/helm/webapp/templates/NOTES.txt
diff --git a/webapp/deploy/helm/templates/_helpers.tpl → deploy/helm/webapp/templates/_helpers.tpl b/webapp/deploy/helm/templates/_helpers.tpl → deploy/helm/webapp/templates/_helpers.tpl
diff --git a/webapp/deploy/helm/templates/deployment.yaml → deploy/helm/webapp/templates/deployment.yaml b/webapp/deploy/helm/templates/deployment.yaml → deploy/helm/webapp/templates/deployment.yaml
diff --git a/webapp/deploy/helm/templates/hpa.yaml → deploy/helm/webapp/templates/hpa.yaml b/webapp/deploy/helm/templates/hpa.yaml → deploy/helm/webapp/templates/hpa.yaml
diff --git a/webapp/deploy/helm/templates/ingress.yaml → deploy/helm/webapp/templates/ingress.yaml b/webapp/deploy/helm/templates/ingress.yaml → deploy/helm/webapp/templates/ingress.yaml
diff --git a/webapp/deploy/helm/templates/service.yaml → deploy/helm/webapp/templates/service.yaml b/webapp/deploy/helm/templates/service.yaml → deploy/helm/webapp/templates/service.yaml
diff --git a/...deploy/helm/templates/serviceaccount.yaml → ...helm/webapp/templates/serviceaccount.yaml b/...deploy/helm/templates/serviceaccount.yaml → ...helm/webapp/templates/serviceaccount.yaml
diff --git a/...helm/templates/tests/test-connection.yaml → ...bapp/templates/tests/test-connection.yaml b/...helm/templates/tests/test-connection.yaml → ...bapp/templates/tests/test-connection.yaml
diff --git a/webapp/deploy/helm/values.yaml → deploy/helm/webapp/values.yaml b/webapp/deploy/helm/values.yaml → deploy/helm/webapp/values.yaml
diff --git a/webapp/deploy/Dockerfile → webapp/Dockerfile b/webapp/deploy/Dockerfile → webapp/Dockerfile