Fix release pipeline (#628)

* move release pipeline to main
* update chart versions
* fix helm chart unit test

.github/workflows/main.yml

@@ -55,3 +55,28 @@ jobs:
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v2
+
+  helm-charts:
+    # you have to update the `charts/logprep/Chart.yaml` versions to trigger a new release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: main
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Run chart-releaser
+        uses: helm/[email protected]
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/publish-release-to-pypi.yml

@@ -80,51 +80,3 @@ jobs:
             ghcr.io/fkie-cad/logprep:py${{ matrix.python-version }}-${{ github.ref_name }}
             ghcr.io/fkie-cad/logprep:py${{ matrix.python-version }}-stable
             ghcr.io/fkie-cad/logprep:py${{ matrix.python-version }}-latest
-
-  helm-charts:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: main
-
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "[email protected]"
-
-      - name: Install Helm
-        uses: azure/setup-helm@v4
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-      - name: template Chart.yaml
-        env:
-          LOGPREP_VERSION: ${{ github.ref_name }}
-        run: |
-          sed "s/{{ LOGPREP_VERSION }}/$LOGPREP_VERSION/g" charts/logprep/Chart.yaml.j2 > ./charts/logprep/Chart.yaml
-
-      - uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: Update Logprep chart versions
-          branch: main
-          # Optional glob pattern of files which should be added to the commit
-          # Defaults to all (.)
-          # See the `pathspec`-documentation for git
-          # - https://git-scm.com/docs/git-add#Documentation/git-add.txt-ltpathspecgt82308203
-          # - https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec
-          file_pattern: "charts/logprep/Chart.yaml"
-
-      - name: update release tag
-        uses: rickstaa/action-create-tag@v1
-        id: "tag_update"
-        with:
-          tag: ${{ github.ref_name }}
-          force_push_tag: true
-
-      - name: Run chart-releaser
-        uses: helm/[email protected]
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

charts/logprep/Chart.yaml

@@ -6,10 +6,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "1.0.0"
+version: "13.0.0"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "12.0.0"
+appVersion: "13.0.0"

tests/unit/charts/test_base.py

@@ -2,6 +2,7 @@
 # pylint: disable=attribute-defined-outside-init
 # pylint: disable=protected-access
 
+import re
 import subprocess
 from tempfile import NamedTemporaryFile
 from typing import Dict, Optional
@@ -68,7 +69,6 @@ def test_labels_are_set(self):
     @pytest.mark.parametrize(
         "label, label_value",
         [
-            ("app.kubernetes.io/version", "12.0.0"),
             ("app.kubernetes.io/name", "logprep-logprep"),
             ("app.kubernetes.io/application", "logprep"),
             ("app.kubernetes.io/managed-by", "Helm"),
@@ -78,3 +78,9 @@ def test_labels_are_set(self):
     def test_common_labels_are_set(self, label, label_value):
         for manifest in self.manifests:
             assert manifest["metadata.labels"][label] == label_value
+
+    def test_chart_version_is_set(self):
+        for manifest in self.manifests:
+            assert re.search(
+                r"\d+\.\d+\.\d+", manifest["metadata.labels"]["app.kubernetes.io/version"]
+            )