helm chart build & push

.gitea/workflows/check-version.yml

@@ -27,17 +27,56 @@ jobs:
       version: ${{ steps.set-outputs.outputs.version }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/checkout@v4
-        with:
-          repository: niko/gitea-ci-library
-          path: .ci
 
       - name: Check existing artifact and calculate version
-        env:
+        run: |
-          SERVER_URL: ${{ gitea.server_url }}
+          if [ -n "${VERSION_FILE}" ]; then
-          REPO: ${{ github.repository }}
+            if echo "${VERSION_FILE}" | grep -q '\.json$'; then
-          SHA: ${{ github.sha }}
+              RAW_VERSION=$(jq -r '.version' "${VERSION_FILE}")
-        run: bash .ci/scripts/check-version.sh
+            elif echo "${VERSION_FILE}" | grep -q -E '\.ya?ml$'; then
+              RAW_VERSION=$(grep -oP '^version:\s*\K\S+' "${VERSION_FILE}")
+            else
+              RAW_VERSION=$(cat "${VERSION_FILE}" | tr -d '[:space:]')
+            fi
+          elif [ -f VERSION ]; then
+            RAW_VERSION=$(cat VERSION | tr -d '[:space:]')
+          elif [ -f package.json ]; then
+            RAW_VERSION=$(jq -r '.version' package.json)
+          elif [ -f pom.xml ]; then
+            RAW_VERSION=$(grep -oP '<version>\K[^<]+' pom.xml | head -1)
+          else
+            echo "ERROR: No VERSION file, package.json, Chart.yaml or pom.xml found" >&2
+            exit 1
+          fi
+          BASE_VERSION=$(echo "$RAW_VERSION" | cut -d'.' -f1-2)
+          echo "gitea-ci-library - Tunnistettu Major.Minor versio: $BASE_VERSION"
+
+          TAGS_JSON=$(curl -s -f -H "Authorization: token $GITEA_TOKEN" \
+            "${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/tags")
+
+          TAG=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX}" '
+            if type == "array" then
+              .[] | select(.commit.sha == "${{ github.sha }}" and (.name | startswith($prefix))) | .name
+            else empty end' | head -1)
+
+          mkdir -p /tmp/build-ctx
+
+          if [ -n "$TAG" ]; then
+            echo "ARTIFACT_EXISTS=true" > /tmp/build-ctx/build.env
+            echo "NEXT_VERSION=$TAG" >> /tmp/build-ctx/build.env
+            echo "gitea-ci-library - Artefakti löytyi jo tagilla: $TAG."
+          else
+            echo "ARTIFACT_EXISTS=false" > /tmp/build-ctx/build.env
+
+            HIGHEST_PATCH=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX}" --arg bv "${GIT_TAG_PREFIX}${BASE_VERSION}." '
+              if type == "array" then .[] | .name | select(startswith($bv)) | sub($bv; "") | tonumber else empty end' | sort -rn | head -1)
+
+            if [ -z "$HIGHEST_PATCH" ]; then NEXT_PATCH=0; else NEXT_PATCH=$((HIGHEST_PATCH + 1)); fi
+            FULL_VERSION="${BASE_VERSION}.${NEXT_PATCH}"
+
+            echo "NEXT_VERSION=$FULL_VERSION" >> /tmp/build-ctx/build.env
+            echo "gitea-ci-library - Uusi vapaa versio: $FULL_VERSION"
+          fi
 
       - name: Set job outputs
         id: set-outputs

.gitea/workflows/git-pages.ci-main.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - feature/helm-chart
     paths:
       - git-pages/**
       - .gitea/workflows/helm-build-push.yml

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

@@ -39,12 +39,6 @@ jobs:
     container:
       image: alpine/helm:3.19.0
     steps:
-      - name: Install Node.js for actions/checkout
-        # COMPROMISE: Requires internet access.
-        # Does NOT work in air-gapped environments.
-        # Replace with a custom image (e.g., extending alpine/helm + nodejs) if needed.
-        run: apk add --no-cache nodejs
-
       - uses: actions/checkout@v4
       - uses: actions/checkout@v4
         with:
@@ -53,7 +47,6 @@ jobs:
 
       - name: Package Helm chart
         run: |
-          helm dependency update "${CHART_PATH}"
           helm package "${CHART_PATH}" \
             --version "${VERSION}" \
             --app-version "${VERSION}" \

docs/workflows.md

@@ -63,77 +63,15 @@ checkout → laske versio package.json + git-tageista → output
 
 **Trigger:** `workflow_call`
 
-**Inputs:**
+**Inputs:** `env_json`, `version`
-
-| Parametri | Pakollinen | Kuvaus |
-|-----------|------------|--------|
-| `env_json` | Kyllä | Konffi `gitea-env.conf`:stä |
-| `version` | Kyllä | Version string (check-version output) |
-
-**`env_json`-avaimet:**
-
-| Avain | Pakollinen | Kuvaus |
-|-------|------------|--------|
-| `DOCKER_REGISTRY` | Kyllä | Registry (esim. `gitea.app.keskikuja.site/niko`) |
-| `DOCKER_IMAGE_NAME` | Kyllä | Kuvan nimi ilman registry-polkua |
-| `DOCKER_UI_URL` | Ei | Registry UI -linkki raportointia varten |
-| `DOCKERFILE` | Ei | Dockerfile-polku, oletus `Dockerfile` |
-| `GITEA_API_URL` | Kyllä | Gitean API-URL |
-| `GIT_TAG_PREFIX` | Ei | Tag-prefix (esim. `docker/`) |
 
 **Secrets:** `GITEA_TOKEN`, `DOCKER_USERNAME`, `DOCKER_PASSWORD`
 
 **Steppi-kaavio:**
 ```
-build-push (build + push, labelit: commit+date) → tag-commit (git-tagin luonti)
+build-push (build + push samassa jobissa, ei levyn kautta) → tag-commit
 ```
 
-**Huomio:** Ei käytä `container:`-direktiiviä — ajaa suoraan runnerilla,
-joten `actions/checkout` toimii ilman node-asennuksia.
-
----
-
-### `helm-build-push.yml` — Helm chart build & push
-
-**Trigger:** `workflow_call`
-
-**Inputs:**
-
-| Parametri | Pakollinen | Kuvaus |
-|-----------|------------|--------|
-| `env_json` | Kyllä | Konffi `gitea-env.conf`:stä |
-| `version` | Kyllä | Version string (check-version output) |
-| `chart_path` | Ei | Polku Chart.yaml-hakemistoon, oletus `.` |
-
-**`env_json`-avaimet:**
-
-| Avain | Pakollinen | Kuvaus |
-|-------|------------|--------|
-| `HELM_REGISTRY` | Kyllä | OCI-registry (esim. `gitea.app.keskikuja.site/niko`) |
-| `HELM_UI_URL` | Ei | Registry UI -linkki raportointia varten |
-| `GITEA_API_URL` | Kyllä | Gitean API-URL |
-| `GIT_TAG_PREFIX` | Ei | Tag-prefix (esim. `helm/`) |
-
-**Secrets:** `GITEA_TOKEN`, `HELM_USER`, `HELM_PASSWORD`
-
-**Steppi-kaavio:**
-```
-build-push (helm package → helm push OCI) → tag-commit (git-tagin luonti)
-```
-
-**Steppien kuvaus `build-push`-jobissa:**
-1. **Node.js-asennus** — `apk add --no-cache nodejs` (vaaditaan `actions/checkout`-actionia varten)
-2. **Checkout** — sovellusrepo ja gitea-ci-library `.ci/`-polkuun
-3. **Package** — `helm package` versiolla `$VERSION`
-4. **Push OCI** — `helm push` registryyn autentikoinnilla
-5. **Report status** — commit-status + UI-linkki
-
-**Kompromissi:** Kontti `alpine/helm` ei sisällä node.js:ää, mutta
-`actions/checkout@v4` on JavaScript-action ja vaatii sen. Siksi nodejs
-asennetaan lennossa ennen checkouttia. Tämä vaatii internet-yhteyden
-eikä toimi air gap -ympäristössä. Korvaa tarvittaessa custom-kontilla
-(jossa helm + nodejs, ks. `skills/ci-container-build/SKILL.md`).
-
 ---
 
 ## Consumer-esimerkki (`example-*`)

scripts/check-version.sh

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-RAW_VERSION=""
-
-if [ -n "${VERSION_FILE-}" ] && [ -f "${VERSION_FILE-}" ]; then
-  RAW_VERSION=$(tr -d "$(printf '\xef\xbb\xbf')" < "${VERSION_FILE}" | sed -n 's/^version:[[:space:]]*\([^[:space:]]*\).*/\1/p')
-  if [ -z "${RAW_VERSION}" ]; then
-    if echo "${VERSION_FILE}" | grep -q -E '\.json$'; then
-      RAW_VERSION=$(jq -r '.version' "${VERSION_FILE}")
-    else
-      RAW_VERSION=$(cat "${VERSION_FILE}" | tr -d '[:space:]')
-    fi
-  fi
-fi
-
-if [ -z "${RAW_VERSION}" ]; then
-  if [ -f VERSION ]; then
-    RAW_VERSION=$(cat VERSION | tr -d '[:space:]')
-  elif [ -f package.json ]; then
-    RAW_VERSION=$(jq -r '.version' package.json)
-  elif [ -f pom.xml ]; then
-    RAW_VERSION=$(grep -oP '<version>\K[^<]+' pom.xml | head -1)
-  elif [ -f Chart.yaml ]; then
-    RAW_VERSION=$(tr -d "$(printf '\xef\xbb\xbf')" < Chart.yaml | sed -n 's/^version:[[:space:]]*\([^[:space:]]*\).*/\1/p')
-  else
-    echo "ERROR: No version source found (VERSION_FILE, VERSION, package.json, pom.xml, Chart.yaml)" >&2
-    exit 1
-  fi
-fi
-
-BASE_VERSION=$(echo "$RAW_VERSION" | cut -d'.' -f1-2)
-echo "gitea-ci-library - Tunnistettu Major.Minor versio: $BASE_VERSION"
-
-TAGS_JSON=$(curl -s -f -H "Authorization: token ${GITEA_TOKEN}" \
-  "${SERVER_URL}/api/v1/repos/${REPO}/tags")
-
-TAG=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX-}" --arg sha "${SHA}" '
-  if type == "array" then
-    .[] | select(.commit.sha == $sha and (.name | startswith($prefix))) | .name
-  else empty end' | head -1)
-
-mkdir -p /tmp/build-ctx
-
-if [ -n "$TAG" ]; then
-  echo "ARTIFACT_EXISTS=true" > /tmp/build-ctx/build.env
-  echo "NEXT_VERSION=$TAG" >> /tmp/build-ctx/build.env
-  echo "gitea-ci-library - Artefakti löytyi jo tagilla: $TAG."
-else
-  echo "ARTIFACT_EXISTS=false" > /tmp/build-ctx/build.env
-
-  HIGHEST_PATCH=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX-}" --arg bv "${GIT_TAG_PREFIX-}${BASE_VERSION}." '
-    if type == "array" then .[] | .name | select(startswith($bv)) | sub($bv; "") | tonumber else empty end' | sort -rn | head -1)
-
-  if [ -z "$HIGHEST_PATCH" ]; then NEXT_PATCH=0; else NEXT_PATCH=$((HIGHEST_PATCH + 1)); fi
-  FULL_VERSION="${BASE_VERSION}.${NEXT_PATCH}"
-
-  echo "NEXT_VERSION=$FULL_VERSION" >> /tmp/build-ctx/build.env
-  echo "gitea-ci-library - Uusi vapaa versio: $FULL_VERSION"
-fi

skills/consumer-pipelines/SKILL.md

@@ -189,72 +189,3 @@ Ei pipeä (`|`) komennon perässä — se syö exit-koodin. Käytä redirectiä
 
 Providerin scriptit haetaan `actions/checkout`-stepillä `.ci/`-polkuun.
 Consumer ei kopioi eikä muokkaa providerin tiedostoja.
-
-## 10. Build & Push -providerit
-
-### `docker-build-push.yml` — Docker image build & push
-
-Buildaa ja pushee Docker-imagen OCI-registryyn. Ajaa suoraan runnerilla
-(ei `container:`-direktiiviä), joten `actions/checkout` toimii natiivisti.
-
-**`env_json`-avaimet (pakolliset):**
-
-```yaml
-DOCKER_REGISTRY: gitea.app.keskikuja.site/niko
-DOCKER_IMAGE_NAME: my-app
-```
-
-**Käyttö reitittimessä:**
-
-```yaml
-docker-build-push:
-  uses: OWNER/gitea-ci-library/.gitea/workflows/docker-build-push.yml@v1
-  needs: [check-version]
-  if: needs.check-version.outputs.artifact_exists == 'false'
-  secrets: inherit
-  with:
-    env_json: ${{ needs.load-config.outputs.env_json }}
-    version:  ${{ needs.check-version.outputs.version }}
-```
-
-Tarkka input/secret-lista: `docs/workflows.md`.
-
-### `helm-build-push.yml` — Helm chart build & push
-
-Pakkaa ja pushee Helm-chartin OCI-registryyn. Käyttää `alpine/helm`-konttia.
-
-**`env_json`-avaimet (pakolliset):**
-
-```yaml
-HELM_REGISTRY: gitea.app.keskikuja.site/niko
-```
-
-**Käyttö reitittimessä:**
-
-```yaml
-helm-build-push:
-  uses: OWNER/gitea-ci-library/.gitea/workflows/helm-build-push.yml@v1
-  needs: [check-version]
-  if: needs.check-version.outputs.artifact_exists == 'false'
-  secrets: inherit
-  with:
-    env_json: ${{ needs.load-config.outputs.env_json }}
-    version:  ${{ needs.check-version.outputs.version }}
-    # chart_path: '.'  # oletus, vaihda jos Chart.yaml on alihakemistossa
-```
-
-**Node.js-kompromissi:** `actions/checkout@v4` on JavaScript-action.
-Kontissa `alpine/helm` ei ole node.js:ää, joten se asennetaan lennossa
-`apk add --no-cache nodejs` ennen checkouttia.
-
-- Vaatii internet-yhteyden
-- Ei toimi air gap -ympäristössä
-- Korvaa tarvittaessa custom-kontilla (helm + nodejs):
-  rakenna `ci-container-build`-skillillä ja päivitä workflow'n
-  `container: image:` osoittamaan omaan konttiin
-
-**Yksittäisten Helm-UI-linkkien raportointi:** `HELM_UI_URL` on
-tarkoitettu yleiselle registry UI:lle — provider muodostaa linkin
-`${HELM_UI_URL}/${CHART_NAME}/${VERSION}` automaattisesti.
-
-Tarkka input/secret-lista: `docs/workflows.md`.

tests/check-version.bats

@@ -1,182 +0,0 @@
-#!/usr/bin/env bats
-
-source "$BATS_TEST_DIRNAME/helpers/mock-api.sh"
-
-setup() {
-  export GITEA_TOKEN=test-token
-  export GIT_TAG_PREFIX=""
-  export SERVER_URL="http://localhost:18080"
-  export REPO="niko/test"
-  export SHA="abc123"
-  rm -rf /tmp/build-ctx
-}
-
-teardown() {
-  mock_stop 2>/dev/null || true
-  rm -rf /tmp/build-ctx
-}
-
-@test "VERSION_FILE=Chart.yaml extracts version from YAML" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/Chart.yaml"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "false" ]
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "VERSION_FILE=VERSION extracts version from plain text" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "false" ]
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "VERSION_FILE=package.json extracts version from JSON" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/package.json"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "false" ]
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "VERSION_FILE=subdir/Chart.yaml extracts version from monorepo" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/subdir/Chart.yaml"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "false" ]
-  [ "$NEXT_VERSION" = "0.4.0" ]
-}
-
-@test "no VERSION_FILE, root VERSION found" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  WORKDIR=$(mktemp -d)
-  cp "$BATS_TEST_DIRNAME/fixtures/check-version/VERSION" "$WORKDIR/VERSION"
-
-  SCRIPT="$PWD/scripts/check-version.sh"
-  run bash -c "cd '$WORKDIR' && exec bash '$SCRIPT'"
-
-  rm -rf "$WORKDIR"
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "no VERSION_FILE, root Chart.yaml found" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  WORKDIR=$(mktemp -d)
-  cp "$BATS_TEST_DIRNAME/fixtures/check-version/Chart.yaml" "$WORKDIR/Chart.yaml"
-
-  SCRIPT="$PWD/scripts/check-version.sh"
-  run bash -c "cd '$WORKDIR' && exec bash '$SCRIPT'"
-
-  rm -rf "$WORKDIR"
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "tag exists for commit sets ARTIFACT_EXISTS=true" {
-  mock_set_sequence '[{"code": 200, "body": [{"name": "0.3.0", "commit": {"sha": "abc123"}}]}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "true" ]
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "tag with prefix filters correctly" {
-  mock_set_sequence '[{"code": 200, "body": [{"name": "git-pages/0.3.0", "commit": {"sha": "abc123"}}, {"name": "docker/0.3.0", "commit": {"sha": "abc123"}}]}]'
-  mock_start
-
-  export GIT_TAG_PREFIX="git-pages/"
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "true" ]
-  [ "$NEXT_VERSION" = "git-pages/0.3.0" ]
-}
-
-@test "no tag, new version calculated" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "false" ]
-  [ "$NEXT_VERSION" = "0.3.0" ]
-}
-
-@test "highest patch calculated correctly" {
-  mock_set_sequence '[{"code": 200, "body": [{"name": "0.3.0", "commit": {"sha": "def456"}}, {"name": "0.3.1", "commit": {"sha": "def456"}}]}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
-  run bash scripts/check-version.sh
-
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  [ "$ARTIFACT_EXISTS" = "false" ]
-  [ "$NEXT_VERSION" = "0.3.2" ]
-}
-
-@test "VERSION_FILE=Chart-umbrella.yaml extracts only top-level version" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/Chart-umbrella.yaml"
-  run bash scripts/check-version.sh
-
-  echo "STATUS=$status"
-  echo "OUTPUT=$output"
-  [ "$status" -eq 0 ]
-  source /tmp/build-ctx/build.env
-  echo "NEXT_VERSION=$NEXT_VERSION"
-  [ "$NEXT_VERSION" = "0.1.0" ]
-}
-
-@test "no version source exits with error" {
-  mock_set_sequence '[{"code": 200, "body": []}]'
-  mock_start
-
-  WORKDIR=$(mktemp -d)
-  SCRIPT="$PWD/scripts/check-version.sh"
-  run bash -c "cd '$WORKDIR' && exec bash '$SCRIPT'"
-
-  rm -rf "$WORKDIR"
-  [ "$status" -eq 1 ]
-  [[ "$output" == *"ERROR"* ]]
-}

tests/fixtures/check-version/Chart-umbrella.yaml

@@ -1,12 +0,0 @@
-apiVersion: v2
-name: agent-platform
-description: Agent Platform umbrella chart
-type: application
-version: 0.1.0
-dependencies:
-  - name: vikunja
-    version: "0.1.0"
-    repository: oci://registry.example.com
-  - name: langfuse
-    version: "0.2.0"
-    repository: oci://registry.example.com

tests/fixtures/check-version/Chart.yaml

@@ -1,6 +0,0 @@
-apiVersion: v2
-name: test-chart
-description: Test chart for version extraction
-type: application
-version: 0.3.0
-appVersion: "1.0.0"

tests/fixtures/check-version/VERSION

@@ -1 +0,0 @@
-0.3.0

tests/fixtures/check-version/package.json

@@ -1 +0,0 @@
-{"version": "0.3.0"}

tests/fixtures/check-version/pom.xml

@@ -1 +0,0 @@
-<project><version>0.3.0</version></project>

tests/fixtures/check-version/subdir/Chart.yaml

@@ -1,6 +0,0 @@
-apiVersion: v2
-name: subdir-chart
-description: Chart in subdirectory for monorepo testing
-type: application
-version: 0.4.0
-appVersion: "1.0.0"