Fix helm chart publishing (#1780)

nuclia · Jan 29, 2024 · 2ab2303 · 2ab2303 · github-actions · Jan 29, 2024
1 parent a61e6c5
commit 2ab2303
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -175,10 +175,19 @@ jobs:
       - name: Set helm package image
         id: version_step
         run: |-
-          HELM_PACKAGE_VERSION=`cat VERSION`
-          NUCLIADB_IMAGE_VERSION=${{ steps.env-vars.outputs.short_sha }}
-          sed -i.bak "s#99999.99999.99999#$NUCLIADB_IMAGE_VERSION#" ./charts/nucliadb/Chart.yaml
-          echo "helm_package_version=$HELM_PACKAGE_VERSION" >> $GITHUB_OUTPUT
+          python bump.py --build=${{github.run_number}}
+          DOCKER_VERSION=`cat VERSION`
+
+          # Helm package versioning does not support '.postX'. Convert to '+postX'
+          HELM_VERSION=`echo $DOCKER_VERSION | sed 's/.post/+post/'`
+
+          # Update chart with versions
+          echo "HELM_VERSION=$HELM_VERSION"
+          echo "DOCKER_VERSION=$DOCKER_VERSION"
+          sed -i.bak "s#99999.99999.99999#$HELM_VERSION#" ./charts/nucliadb/Chart.yaml
+          sed -i.bak "s#88888.88888.88888#$DOCKER_VERSION#" ./charts/nucliadb/Chart.yaml
+
+          echo "helm_version=$HELM_VERSION" >> $GITHUB_OUTPUT
 
       - name: Configure Git
         run: |
@@ -194,7 +203,7 @@ jobs:
         run: |-
           helm lint charts/nucliadb
           helm package charts/nucliadb
-          curl --data-binary "@nucliadb-${{ steps.version_step.outputs.helm_package_version }}.tgz" ${{ secrets.HELM_CHART_URL }}/api/charts
+          curl --data-binary "@nucliadb-${{ steps.version_step.outputs.helm_version }}.tgz" ${{ secrets.HELM_CHART_URL }}/api/charts
 
       # Not working yet, disabled for now
       # - name: Repository Dispatch

diff --git a/charts/nucliadb/Chart.yaml b/charts/nucliadb/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: NucliaDB Chart for standalone deployment
 name: nucliadb
 version: 99999.99999.99999
-appVersion: 99999.99999.99999
+appVersion: 88888.88888.88888
 keywords:
   - nucliadb
   - nuclia

diff --git a/charts/nucliadb/templates/sts.yaml b/charts/nucliadb/templates/sts.yaml
@@ -46,7 +46,7 @@ spec:
       serviceAccount:  {{ .Values.serviceAccount | default "default" }}
       containers:
       - name: app
-        image: "{{ .Values.image }}:{{ .Values.imageVersion | default .Chart.Version }}"
+        image: "{{ .Values.image }}:{{ .Values.imageVersion | default .Chart.AppVersion }}"
         securityContext:
           privileged: false
         imagePullPolicy: {{ .Values.imagePullPolicy }}

diff --git a/nucliadb/requirements.txt b/nucliadb/requirements.txt
@@ -2,7 +2,7 @@ uvicorn<0.19.0
 pydantic_argparse
 nucliadb-node-binding>=2.26.0
 
-aiohttp>=3.9.0
+aiohttp>=3.9.0,<3.9.2
 lru-dict>=1.1.7
 backoff
 aiofiles>=0.8.0

diff --git a/nucliadb_utils/requirements.txt b/nucliadb_utils/requirements.txt
@@ -1,5 +1,5 @@
 pydantic>=1.8.2,<2.0
-aiohttp>=3.9.0
+aiohttp>=3.9.0,<3.9.2
 prometheus-client>=0.12.0
 types-requests>=2.27.7
 mmh3>=3.0.0