From 6c636fb4ec04e55d0ef587f770ada6bc3356b7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Fri, 20 Feb 2026 01:43:37 +0100 Subject: [PATCH 1/3] feat: test multiarch images build and push --- .github/workflows/e2e-tests.yml | 2 +- .github/workflows/release.yml | 21 +++++++++++---------- Makefile | 12 ++++++++++-- cmd/main.go | 2 +- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 7167a66..4fd38ee 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -7,7 +7,7 @@ permissions: on: pull_request: - branches: [main] + branches: [no-launch] paths-ignore: ['docs/**'] workflow_dispatch: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96ae329..552d735 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,10 +3,7 @@ name: 🚀 Release permissions: read-all -on: - release: - types: - - created +on: workflow_dispatch env: REGISTRY: ghcr.io @@ -76,16 +73,20 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: 🏗️ Build and push Operator image run: | - make docker-build IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - make docker-push IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: 🏗️ Build and push Operator bundle + make docker-build-and-push-multiarch IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: 🏗️ Build and push Operator bundle image run: | make bundle IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - make bundle-build IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - make bundle-push IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: 🏗️ Build and push Operator catalog + make bundle-build-and-push-multiarch IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: 🏗️ Build and push Operator catalog image run: | make catalog-build IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} make catalog-push IMAGE_TAG_BASE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} diff --git a/Makefile b/Makefile index f0cff40..ca83c83 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ SHELL := /bin/bash NAME := redkey-operator -VERSION := 0.1.0 +VERSION := test ROBIN_VERSION := 0.1.0 GOLANG_VERSION := 1.25.7 DELVE_VERSION := 1.25 @@ -524,13 +524,21 @@ endif # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator .PHONY: catalog-build catalog-build: opm ## Build a catalog image. - $(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) + $(OPM) index add --container-tool $(CONTAINER_TOOL) --mode replaces --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) # Push the catalog image. .PHONY: catalog-push catalog-push: ## Push a catalog image. $(MAKE) docker-push IMG=$(CATALOG_IMG) +docker-build-and-push-multiarch: test ## Build and push operator docker image for multiple architectures (uses `${IMG}` image name). + $(info $(M) building and pushing operator docker image for multiple architectures) + $(CONTAINER_TOOL) buildx build --platform linux/amd64,linux/arm64 -t ${IMG} --build-arg GOLANG_VERSION=$(GOLANG_VERSION) . --push + +bundle-build-and-push-multiarch: ## Build and push bundle docker image for multiple architectures (uses `${BUNDLE_IMG}` image name). + $(info $(M) building and pushing bundle docker image for multiple architectures) + $(CONTAINER_TOOL) buildx build --platform linux/amd64,linux/arm64 -t ${BUNDLE_IMG} . --push + ##@ Test TEST_PATHS := ./controllers/ ./internal/*/ ./api/*/ diff --git a/cmd/main.go b/cmd/main.go index 53ba6cd..170cedd 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -32,7 +32,7 @@ import ( const ( USER_AGENT_NAME = "redkey-cluster-operator" - USER_AGENT_VERSION = "0.1.0" + USER_AGENT_VERSION = "test" ) var ( From 6dad73ef69d9fff1ab6d05170eaac6702b7624f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Fri, 20 Feb 2026 01:49:15 +0100 Subject: [PATCH 2/3] feat: test multiarch images build and push --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 552d735..6d47335 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: 🚀 Release permissions: read-all -on: workflow_dispatch +on: push env: REGISTRY: ghcr.io From 01d4412e09f60f15ee4accacfb653fb6faa46fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Fri, 20 Feb 2026 01:51:58 +0100 Subject: [PATCH 3/3] feat: test multiarch images build and push --- Makefile | 2 +- cmd/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ca83c83..8591319 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SHELL := /bin/bash NAME := redkey-operator VERSION := test -ROBIN_VERSION := 0.1.0 +ROBIN_VERSION := 0.0.1 GOLANG_VERSION := 1.25.7 DELVE_VERSION := 1.25 diff --git a/cmd/main.go b/cmd/main.go index 170cedd..44de60b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -32,7 +32,7 @@ import ( const ( USER_AGENT_NAME = "redkey-cluster-operator" - USER_AGENT_VERSION = "test" + USER_AGENT_VERSION = "0.0.1" ) var (