From c3598366b5b67077e9c75b140c08ef13abf983f6 Mon Sep 17 00:00:00 2001 From: William Welter Date: Thu, 10 Sep 2026 17:05:39 +0100 Subject: [PATCH] Fix release workflows --- .github/workflows/helm.yml | 6 ++++-- .github/workflows/release.yml | 9 +++++++-- Makefile | 2 +- docs/docker.md | 2 +- examples/manifests/mariadb_replication.yaml | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 6a6ebe3827..1b5db2b545 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -191,6 +191,8 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | shopt -s nullglob + OWNER="${{ github.repository_owner }}" + OWNER="${OWNER,,}" for pkg in .cr-release-packages/*.tgz; do if [ -z "${pkg:-}" ]; then break @@ -199,9 +201,9 @@ jobs: # e.g. mariadb-operator-crds-26.6.0.tgz -> chart_name=mariadb-operator-crds, chart_version=26.6.0 chart_name=$(basename "${pkg}" .tgz | sed 's/-[0-9].*$//') chart_version=$(basename "${pkg}" .tgz | sed 's/^.*-\([0-9].*\)$/\1/') - repo="oci://ghcr.io/${{ github.repository_owner }}/charts" + repo="oci://ghcr.io/${OWNER}/charts" - if gh api "/orgs/${{ github.repository_owner }}/packages/container/charts%2F${chart_name}/versions" \ + if gh api "/orgs/${OWNER}/packages/container/charts%2F${chart_name}/versions" \ --jq ".[].metadata.container.tags[]" 2>/dev/null | grep -q "^${chart_version}$"; then echo "Chart already exists: ${chart_name} ${chart_version}" else diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ea069324e..793ef24c98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,6 +78,11 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io + - name: Set lowercase image owner + run: | + OWNER="${{ github.repository_owner }}" + echo "OWNER=${OWNER,,}" >> $GITHUB_ENV + - name: Publish multi-arch Docker image uses: docker/build-push-action@v7 with: @@ -87,8 +92,8 @@ jobs: file: ./Dockerfile platforms: linux/arm64,linux/amd64 tags: | - ghcr.io/${{ github.repository_owner }}/mariadb-operator:${{ needs.args.outputs.VERSION }} - ghcr.io/${{ github.repository_owner }}/mariadb-operator:latest + ghcr.io/${{ env.OWNER }}/mariadb-operator:${{ needs.args.outputs.VERSION }} + ghcr.io/${{ env.OWNER }}/mariadb-operator:latest labels: | org.opencontainers.image.title=${{ github.event.repository.name }} org.opencontainers.image.description=${{ github.event.repository.description }} diff --git a/Makefile b/Makefile index 7fb85444d7..3baea18d23 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ endif SHELL = /usr/bin/env bash -o pipefail .SHELLFLAGS = -ec -VERSION ?= 26.6.0-bandwidth.1 +VERSION ?= 26.6.0-bandwidth.2 # mariadb-operator IMG_NAME ?= ghcr.io/mariadb-operator/mariadb-operator diff --git a/docs/docker.md b/docs/docker.md index 909c1063f8..3eab12e8c8 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -36,7 +36,7 @@ MariaDB Operator - ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.1 + ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.2 amd64 arm64 diff --git a/examples/manifests/mariadb_replication.yaml b/examples/manifests/mariadb_replication.yaml index 89769eddce..f5f4dd2699 100644 --- a/examples/manifests/mariadb_replication.yaml +++ b/examples/manifests/mariadb_replication.yaml @@ -66,10 +66,10 @@ spec: # syncBinlog: 1 # Init container that cooperates with mariadb-operator. # initContainer: - # image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.1 + # image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.2 # Agent sidecar that cooperates with mariadb-operator. # agent: - # image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.1 + # image: ghcr.io/mariadb-operator/mariadb-operator:26.6.0-bandwidth.2 service: type: LoadBalancer