diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e607a25..c1a2c01 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,14 +23,10 @@ jobs: ffb60bb8-8422-4d3b-95a1-b20700fb5232 > GPG_PASSPHRASE - name: Prepare GPG key run: | - gpg_dir=.cr-gpg - mkdir "$gpg_dir" - keyring="$gpg_dir/secring.gpg" - base64 -d <<< "$GPG_KEYRING_BASE64" > "$keyring" - passphrase_file="$gpg_dir/passphrase" - echo "$GPG_PASSPHRASE" > "$passphrase_file" - echo "CR_PASSPHRASE_FILE=$passphrase_file" >> "$GITHUB_ENV" - echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV" + ./hack/gpg.sh \ + "${GPG_KEYRING_BASE64}" \ + "${GPG_PASSPHRASE}" \ + "${GITHUB_ENV}" - uses: azure/setup-helm@v4 with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/anza-labs/lubelogger/Chart.yaml b/anza-labs/lubelogger/Chart.yaml index 48a9b29..e38d620 100644 --- a/anza-labs/lubelogger/Chart.yaml +++ b/anza-labs/lubelogger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: lubelogger description: LubeLogger is a web-based vehicle maintenance and fuel mileage tracker type: application -version: 0.4.4 +version: 0.4.5 appVersion: "v1.3.8" maintainers: - name: Mateusz Urbanek diff --git a/anza-labs/lubelogger/README.md b/anza-labs/lubelogger/README.md index c7a138f..55ee66f 100644 --- a/anza-labs/lubelogger/README.md +++ b/anza-labs/lubelogger/README.md @@ -1,6 +1,6 @@ # lubelogger -![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat) ![AppVersion: v1.3.8](https://img.shields.io/badge/AppVersion-v1.3.8-informational?style=flat) +![Version: 0.4.5](https://img.shields.io/badge/Version-0.4.5-informational?style=flat) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat) ![AppVersion: v1.3.8](https://img.shields.io/badge/AppVersion-v1.3.8-informational?style=flat) LubeLogger is a web-based vehicle maintenance and fuel mileage tracker diff --git a/anza-labs/lubelogger/templates/service.yaml b/anza-labs/lubelogger/templates/service.yaml index 2c4a7a8..9342fda 100644 --- a/anza-labs/lubelogger/templates/service.yaml +++ b/anza-labs/lubelogger/templates/service.yaml @@ -1,3 +1,4 @@ +{{- $svcPort := .Values.service.port -}} apiVersion: v1 kind: Service metadata: @@ -8,7 +9,7 @@ metadata: spec: type: ClusterIP ports: - - port: 8080 + - port: {{ $svcPort }} targetPort: http protocol: TCP name: http diff --git a/hack/gpg.sh b/hack/gpg.sh new file mode 100755 index 0000000..8a7a867 --- /dev/null +++ b/hack/gpg.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -eou + +GPG_KEYRING_BASE64="$1" +GPG_PASSPHRASE="$2" +GITHUB_ENV="$3" + +gpg_dir=.cr-gpg +rm -rf "$gpg_dir" +mkdir "$gpg_dir" +keyring="$gpg_dir/secring.gpg" +base64 -d <<< "${GPG_KEYRING_BASE64:?Keyring not set or empty}" > "$keyring" +passphrase_file="$gpg_dir/passphrase" +echo -n "${GPG_PASSPHRASE:?Passphrase not set or empty}" > "$passphrase_file" +echo "CR_PASSPHRASE_FILE=$passphrase_file" >> "$GITHUB_ENV" +echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV"