Fixup workflows

Author: Scott Davidson

.github/workflows/docker-build-push-web-container-on-tag.yml

@@ -41,11 +41,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push by digest
         id: build

.github/workflows/helm-build-push.yml

@@ -20,11 +20,11 @@ jobs:
       # on main or a stable tag on a dev branch.
 
       - name: Fail on semver pre-release chart version
-        run: yq .version deployment/helm/Chart.yaml | grep -v '[a-zA-Z-]'
+        run: yq .version deployment/helm/charts/danswer/Chart.yaml | grep -v '[a-zA-Z-]'
         if: ${{ github.ref_name == 'main' }}
 
       - name: Fail on stable semver chart version
-        run: yq .version deployment/helm/Chart.yaml | grep '[a-zA-Z-]'
+        run: yq .version deployment/helm/charts/danswer/Chart.yaml | grep '[a-zA-Z-]'
         if: ${{ github.ref_name != 'main' }}
 
       # To reduce resource usage images are built only on tag.
@@ -37,19 +37,19 @@ jobs:
           curl -H "Authorization: Bearer $(echo ${{ secrets.GITHUB_TOKEN }} | base64)"
           https://ghcr.io/v2/stackhpc/danswer/danswer-backend/tags/list
           | jq .tags
-          | grep $( yq .appVersion deployment/helm/Chart.yaml )-$( yq .tagSuffix deployment/helm/values.yaml )
+          | grep $( yq .appVersion deployment/helm/charts/danswer/Chart.yaml )-$( yq .tagSuffix deployment/helm/values.yaml )
           &&
           curl -H "Authorization: Bearer $(echo ${{ secrets.GITHUB_TOKEN }} | base64)"
           https://ghcr.io/v2/stackhpc/danswer/danswer-web-server/tags/list
           | jq .tags
-          | grep $( yq .appVersion deployment/helm/Chart.yaml )-$( yq .tagSuffix deployment/helm/values.yaml )
+          | grep $( yq .appVersion deployment/helm/charts/danswer/Chart.yaml )-$( yq .tagSuffix deployment/helm/values.yaml )
 
       # Check if current chart version exists in releases already
       - name: Check for Helm chart version bump
         id: version_check
         run: |
           set -xe
-          chart_version=$(yq .version deployment/helm/Chart.yaml)
+          chart_version=$(yq .version deployment/helm/charts/danswer/Chart.yaml)
           if [[ $(curl https://api.github.com/repos/stackhpc/danswer/releases | jq '.[].tag_name' | grep danswer-helm-$chart_version) ]]; then
             echo chart_version_changed=false >> $GITHUB_OUTPUT
           else