From 9bc7737209be9d6da03d6d2a540ca1f3165c2a31 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Thu, 16 Oct 2025 21:35:44 +0200 Subject: [PATCH] fix(ci): replace volker.raschek/helm with docker.io/alpine/helm --- .gitea/workflows/release.yaml | 30 ++++++++++---- Makefile | 78 ----------------------------------- renovate.json | 7 ---- 3 files changed, 23 insertions(+), 92 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 66760a7..cd9c049 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -7,19 +7,35 @@ on: jobs: publish-chart: - container: - image: docker.io/volkerraschek/helm:3.19.0 runs-on: ubuntu-latest steps: - - name: Install packages via apk - run: | - apk update - apk add git npm jq yq - - uses: actions/checkout@v5.0.0 with: fetch-depth: 0 + - name: Install packages via apt + run: | + apt update --yes + apt install --yes curl ca-certificates curl gnupg jq + + - name: Install helm + env: + HELM_VERSION: v3.19.0 # renovate: datasource=github-releases depName=helm/helm + run: | + curl --fail --location --output /dev/stdout --silent --show-error https://get.helm.sh/helm-${HELM_VERSION}-linux-$(dpkg --print-architecture).tar.gz | tar --extract --gzip --file /dev/stdin + mv linux-$(dpkg --print-architecture)/helm /usr/local/bin/ + rm --force --recursive linux-$(dpkg --print-architecture) helm-${HELM_VERSION}-linux-$(dpkg --print-architecture).tar.gz + helm version + + - name: Install yq + env: + YQ_VERSION: v4.45.4 # renovate: datasource=github-releases depName=mikefarah/yq + run: | + curl --fail --location --output /dev/stdout --silent --show-error https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_$(dpkg --print-architecture).tar.gz | tar --extract --gzip --file /dev/stdin + mv yq_linux_$(dpkg --print-architecture) /usr/local/bin + rm --force --recursive yq_linux_$(dpkg --print-architecture) yq_linux_$(dpkg --print-architecture).tar.gz + yq --version + - name: Add Artifacthub.io annotations run: | NEW_TAG="$(git tag --sort=-version:refname | head -n 1)" diff --git a/Makefile b/Makefile index 6f31404..ffe15ec 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,6 @@ # CONTAINER_RUNTIME CONTAINER_RUNTIME?=$(shell which podman) -# HELM_IMAGE -HELM_IMAGE_REGISTRY_HOST?=docker.io -HELM_IMAGE_REPOSITORY?=volkerraschek/helm -HELM_IMAGE_VERSION?=3.19.0 # renovate: datasource=docker registryUrl=https://docker.io depName=docker.io/volkerraschek/helm -HELM_IMAGE_FULLY_QUALIFIED=${HELM_IMAGE_REGISTRY_HOST}/${HELM_IMAGE_REPOSITORY}:${HELM_IMAGE_VERSION} - -# NODE_IMAGE -NODE_IMAGE_REGISTRY_HOST?=docker.io -NODE_IMAGE_REPOSITORY?=library/node -NODE_IMAGE_VERSION?=24.10.0-alpine # renovate: datasource=docker registryUrl=https://docker.io depName=docker.io/library/node packageName=library/node -NODE_IMAGE_FULLY_QUALIFIED=${NODE_IMAGE_REGISTRY_HOST}/${NODE_IMAGE_REPOSITORY}:${NODE_IMAGE_VERSION} - # MISSING DOT # ============================================================================== missing-dot: @@ -31,72 +19,6 @@ readme/lint: readme/parameters: npm install && npm run readme:parameters -# CONTAINER RUN - README -# ============================================================================== -PHONY+=container-run/readme -container-run/readme: container-run/readme/link container-run/readme/lint container-run/readme/parameters - -container-run/readme/link: - ${CONTAINER_RUNTIME} run \ - --rm \ - --volume $(shell pwd):$(shell pwd) \ - --workdir $(shell pwd) \ - ${NODE_IMAGE_FULLY_QUALIFIED} \ - npm install && npm run readme:link - -container-run/readme/lint: - ${CONTAINER_RUNTIME} run \ - --rm \ - --volume $(shell pwd):$(shell pwd) \ - --workdir $(shell pwd) \ - ${NODE_IMAGE_FULLY_QUALIFIED} \ - npm install && npm run readme:lint - -container-run/readme/parameters: - ${CONTAINER_RUNTIME} run \ - --rm \ - --volume $(shell pwd):$(shell pwd) \ - --workdir $(shell pwd) \ - ${NODE_IMAGE_FULLY_QUALIFIED} \ - npm install && npm run readme:parameters - -# CONTAINER RUN - HELM UNITTESTS -# ============================================================================== -PHONY+=container-run/helm-unittests -container-run/helm-unittests: - ${CONTAINER_RUNTIME} run \ - --env HELM_REPO_PASSWORD=${CHART_SERVER_PASSWORD} \ - --env HELM_REPO_USERNAME=${CHART_SERVER_USERNAME} \ - --rm \ - --volume $(shell pwd):$(shell pwd) \ - --workdir $(shell pwd) \ - ${HELM_IMAGE_FULLY_QUALIFIED} \ - unittest --strict --file 'unittests/**/*.yaml' ./ - -# CONTAINER RUN - HELM UPDATE DEPENDENCIES -# ============================================================================== -PHONY+=container-run/helm-update-dependencies -container-run/helm-update-dependencies: - ${CONTAINER_RUNTIME} run \ - --env HELM_REPO_PASSWORD=${CHART_SERVER_PASSWORD} \ - --env HELM_REPO_USERNAME=${CHART_SERVER_USERNAME} \ - --rm \ - --volume $(shell pwd):$(shell pwd) \ - --workdir $(shell pwd) \ - ${HELM_IMAGE_FULLY_QUALIFIED} \ - dependency update - -# CONTAINER RUN - MARKDOWN-LINT -# ============================================================================== -PHONY+=container-run/helm-lint -container-run/helm-lint: - ${CONTAINER_RUNTIME} run \ - --rm \ - --volume $(shell pwd):$(shell pwd) \ - --workdir $(shell pwd) \ - ${HELM_IMAGE_FULLY_QUALIFIED} \ - lint --values values.yaml . - # PHONY # ============================================================================== # Declare the contents of the PHONY variable as phony. We keep that information diff --git a/renovate.json b/renovate.json index 9172948..0d3d976 100644 --- a/renovate.json +++ b/renovate.json @@ -46,13 +46,6 @@ } ], "packageRules": [ - { - "groupName": "Update docker.io/volkerraschek/helm", - "matchDepNames": [ - "docker.io/volkerraschek/helm", - "volkerraschek/helm" - ] - }, { "groupName": "Update helm plugin 'unittest'", "matchDepNames": [