This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 710c2962342 [sonataflow-operator] Fix #3151 - Add the `catalog` image
on pnpm and adjust platform on bundle (#3152)
710c2962342 is described below
commit 710c29623422ea6c6e75b0421fbf3c64307f30f9
Author: Ricardo Zanini <[email protected]>
AuthorDate: Tue May 27 10:53:17 2025 -0300
[sonataflow-operator] Fix #3151 - Add the `catalog` image on pnpm and
adjust platform on bundle (#3152)
Signed-off-by: Ricardo Zanini <[email protected]>
---
packages/sonataflow-operator/Makefile | 4 ++--
packages/sonataflow-operator/package.json | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/packages/sonataflow-operator/Makefile
b/packages/sonataflow-operator/Makefile
index 7b9ce22000d..0368109a30e 100644
--- a/packages/sonataflow-operator/Makefile
+++ b/packages/sonataflow-operator/Makefile
@@ -342,7 +342,7 @@ bundle: kustomize install-operator-sdk ## Generate bundle
manifests and metadata
.PHONY: bundle-build
BUNDLE_DESCRIPTOR = "images/bundle.yaml"
bundle-build: ## Build the bundle image
- cekit -v --descriptor $(BUNDLE_DESCRIPTOR) build ${build_options}
$(BUILDER) --no-squash --build-arg SOURCE_DATE_EPOCH="$(shell git log -1
--pretty=%ct)"
+ cekit -v --descriptor $(BUNDLE_DESCRIPTOR) build ${build_options}
$(BUILDER) --no-squash --platform=linux/amd64 --build-arg
SOURCE_DATE_EPOCH="$(shell git log -1 --pretty=%ct)"
ifneq ($(ignore_tag),true)
$(BUILDER) tag sonataflow-operator-bundle:latest $(BUNDLE_IMG)
endif
@@ -373,7 +373,7 @@ endif
BUNDLE_IMGS ?= $(BUNDLE_IMG)
# The image tag given to the resulting catalog image (e.g. make catalog-build
CATALOG_IMG=example.com/operator-catalog:v0.2.0).
-CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:v$(VERSION)
+CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:v$(IMAGE_TAG)
# Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to
that image.
ifneq ($(origin CATALOG_BASE_IMG), undefined)
diff --git a/packages/sonataflow-operator/package.json
b/packages/sonataflow-operator/package.json
index d9ab9a25ee9..3eaf647fce4 100644
--- a/packages/sonataflow-operator/package.json
+++ b/packages/sonataflow-operator/package.json
@@ -28,8 +28,11 @@
"image:build:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make container-build\"",
"image:build:win32": "echo 'Image build not supported on Windows'",
"image:bundle:build": "run-script-os",
- "image:bundle:build:darwin:win32": "echo 'Build Operator bundle image not
supported on Windows and macOS'",
- "image:bundle:build:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make bundle bundle-build\"",
+ "image:bundle:build:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make bundle bundle-build\"",
+ "image:bundle:build:win32": "echo 'Build Operator bundle image not
supported on Windows'",
+ "image:catalog:build": "run-script-os",
+ "image:catalog:build:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if --bool
\"$(build-env containerImages.build)\" --then \"make catalog-build\"",
+ "image:catalog:build:win32": "echo 'Build Operator catalog image not
supported on Windows'",
"install": "run-script-os",
"install:darwin:linux": "rimraf bin && go work sync && go mod tidy && pnpm
controllers:update:cfg && pnpm format",
"install:win32": "echo 'Install not supported on Windows'",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
