From 0c591e7b60a392fa106f253d8da6e65d0306699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Andr=C3=A9s=20Villar?= Date: Wed, 29 Apr 2026 13:42:00 +0200 Subject: [PATCH 1/2] Chore: update GitHub Actions to use latest versions of actions and improve multi-arch support --- .github/workflows/PR-verify.yml | 3 +++ .github/workflows/check-code-gen.yml | 10 +++++----- .github/workflows/go-test.yml | 8 ++++---- .github/workflows/release.yml | 11 ++++++++--- .github/workflows/test-bundle.yml | 4 ++-- Makefile | 6 +++--- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.github/workflows/PR-verify.yml b/.github/workflows/PR-verify.yml index 86dd191..6e3e5b2 100644 --- a/.github/workflows/PR-verify.yml +++ b/.github/workflows/PR-verify.yml @@ -6,6 +6,9 @@ on: pull_request: workflow_dispatch: +env: + NODE_VERSION: "20" + jobs: repo-linter: name: Repo Linter diff --git a/.github/workflows/check-code-gen.yml b/.github/workflows/check-code-gen.yml index f35426a..6a07459 100644 --- a/.github/workflows/check-code-gen.yml +++ b/.github/workflows/check-code-gen.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🧲 - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Setup Go ⬇️ - uses: actions/setup-go@v3 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 with: go-version: 1.24.2 @@ -26,14 +26,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🧲 - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Setup Go ⬇️ - uses: actions/setup-go@v3 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 with: go-version: 1.24.2 - - name: Check dependencies Generation 🧪 + - name: Check SDK Code Generation 🧪 run: | make generate manifests git diff --ignore-matching-lines='.*createdAt:.*' --exit-code diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index 4f36f71..c03713e 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🧲 - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Restore go build cache ⏬ uses: actions/cache@v4 @@ -18,7 +18,7 @@ jobs: key: ${{ runner.os }}-go-build-v1 - name: Setup Go ⬇️ - uses: actions/setup-go@v3 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 with: go-version: 1.24.2 @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🧲 - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Restore go build cache ⏬ uses: actions/cache@v4 @@ -41,7 +41,7 @@ jobs: key: ${{ runner.os }}-go-build-v1 - name: Setup Go ⬇️ - uses: actions/setup-go@v3 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 with: go-version: 1.24.2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index edd4684..9e37a07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -92,12 +92,17 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: 🏗️ Build and push Operator image + - name: 🖥️ Set up QEMU (multi-arch emulation) + uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3 + + - name: 🔧 Set up Docker Buildx + uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3 + + - name: 🏗️ Build and push Operator image (multi-arch) run: | - make docker-build docker-push + make docker-buildx PLATFORMS=linux/amd64,linux/arm64 - name: 🏗️ Build and push Operator bundle run: | - make bundle make bundle-build bundle-push - name: 🏗️ Build and push Operator catalog run: | diff --git a/.github/workflows/test-bundle.yml b/.github/workflows/test-bundle.yml index f628721..6544ff6 100644 --- a/.github/workflows/test-bundle.yml +++ b/.github/workflows/test-bundle.yml @@ -12,11 +12,11 @@ jobs: steps: # Checkout the repository - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 # Set up Go environment - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5 with: go-version: "1.24.2" diff --git a/Makefile b/Makefile index ab60d42..23948e8 100644 --- a/Makefile +++ b/Makefile @@ -286,8 +286,8 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada cp -r chart/* deploy/chart/$(VERSION)/ .PHONY: bundle-build -bundle-build: ## Build the bundle image. - docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . +bundle-build: ## Build the bundle image (multi-arch). + $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) -f bundle.Dockerfile -t $(BUNDLE_IMG) . .PHONY: bundle-push bundle-push: ## Push the bundle image. @@ -327,7 +327,7 @@ 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 docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) + $(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) # Push the catalog image. .PHONY: catalog-push From d4b8b6c164483e1a520972460bdb80f07e319dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Andr=C3=A9s=20Villar?= Date: Wed, 29 Apr 2026 14:11:04 +0200 Subject: [PATCH 2/2] Fix: update bundle-build target to use standard build command --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 23948e8..3c104d8 100644 --- a/Makefile +++ b/Makefile @@ -286,8 +286,8 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada cp -r chart/* deploy/chart/$(VERSION)/ .PHONY: bundle-build -bundle-build: ## Build the bundle image (multi-arch). - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) -f bundle.Dockerfile -t $(BUNDLE_IMG) . +bundle-build: ## Build the bundle image. + $(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) . .PHONY: bundle-push bundle-push: ## Push the bundle image.