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 836f95b1ffc [sonataflow-opoerator] NO-ISSUE: Add DbMigrator Env to
SonataFlow Operator envs (#3079)
836f95b1ffc is described below
commit 836f95b1ffc8679cbb46f2a0394841ba15483f9b
Author: Ricardo Zanini <[email protected]>
AuthorDate: Mon Apr 28 12:12:49 2025 -0300
[sonataflow-opoerator] NO-ISSUE: Add DbMigrator Env to SonataFlow Operator
envs (#3079)
Signed-off-by: Ricardo Zanini <[email protected]>
---
packages/sonataflow-operator/Makefile | 3 ++-
packages/sonataflow-operator/env/index.js | 6 +++++
packages/sonataflow-operator/hack/bump-version.sh | 2 --
packages/sonataflow-operator/package.json | 5 +++--
pnpm-lock.yaml | 3 +++
repo/graph.dot | 1 +
repo/graph.json | 27 ++++++++++++++---------
7 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/packages/sonataflow-operator/Makefile
b/packages/sonataflow-operator/Makefile
index d0a95cc0f73..7b9ce22000d 100644
--- a/packages/sonataflow-operator/Makefile
+++ b/packages/sonataflow-operator/Makefile
@@ -517,7 +517,8 @@ update-config:
dataIndexPostgreSQLImageTag=$$(shell build-env
sonataFlowOperator.kogitoDataIndexPostgresqlImage) \
dataIndexEphemeralImageTag=$$(shell build-env
sonataFlowOperator.kogitoDataIndexEphemeralImage) \
sonataFlowBaseBuilderImageTag=$$(shell build-env
sonataFlowOperator.sonataflowBuilderImage) \
- sonataFlowDevModeImageTag=$$(shell build-env
sonataFlowOperator.sonataflowDevModeImage))
+ sonataFlowDevModeImageTag=$$(shell build-env
sonataFlowOperator.sonataflowDevModeImage) \
+ dbMigratorToolImageTag=$$(shell build-env
sonataFlowOperator.kogitoDBMigratorToolImage))
@if [ -z "$(strip $(PARAMS))" ]; then \
echo "⚠️ No variables resolved. Skipping updates to
controllers config file."; \
else \
diff --git a/packages/sonataflow-operator/env/index.js
b/packages/sonataflow-operator/env/index.js
index 85a7e1b3d2a..967321e2689 100644
--- a/packages/sonataflow-operator/env/index.js
+++ b/packages/sonataflow-operator/env/index.js
@@ -25,6 +25,7 @@ const kogitoJobsServiceEphemeralImageEnv =
require("@kie/kogito-jobs-service-eph
const kogitoJobsServicePostgresqlImageEnv =
require("@kie/kogito-jobs-service-postgresql-image/env");
const kogitoDataIndexEphemeralImageEnv =
require("@kie/kogito-data-index-ephemeral-image/env");
const kogitoDataIndexPostgresqlImageEnv =
require("@kie/kogito-data-index-postgresql-image/env");
+const kogitoDBMigratorToolImageEnv =
require("@kie-tools/kogito-db-migrator-tool-image/env");
const rootEnv = require("@kie-tools/root-env/env");
module.exports = composeEnv([rootEnv, sonataflowBuilderImageEnv,
sonataflowDevModeImageEnv], {
@@ -69,6 +70,10 @@ module.exports = composeEnv([rootEnv,
sonataflowBuilderImageEnv, sonataflowDevMo
default:
`${kogitoDataIndexPostgresqlImageEnv.env.kogitoDataIndexPostgresqlImage.registry}/${kogitoDataIndexPostgresqlImageEnv.env.kogitoDataIndexPostgresqlImage.account}/${kogitoDataIndexPostgresqlImageEnv.env.kogitoDataIndexPostgresqlImage.name}:${kogitoDataIndexPostgresqlImageEnv.env.kogitoDataIndexPostgresqlImage.buildTag}`,
description: "Kogito Data Index PostgreSQL image",
},
+ SONATAFLOW_OPERATOR__kogitoDBMigratorToolImage: {
+ default:
`${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.registry}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.account}/${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.name}:${kogitoDBMigratorToolImageEnv.env.kogitoDbMigratorToolImage.buildTag}`,
+ description: "Kogito DB Migrator image",
+ },
}),
get env() {
return {
@@ -84,6 +89,7 @@ module.exports = composeEnv([rootEnv,
sonataflowBuilderImageEnv, sonataflowDevMo
kogitoJobsServicePostgresqlImage:
getOrDefault(this.vars.SONATAFLOW_OPERATOR__kogitoJobsServicePostgresqlImage),
kogitoDataIndexEphemeralImage:
getOrDefault(this.vars.SONATAFLOW_OPERATOR__kogitoDataIndexEphemeralImage),
kogitoDataIndexPostgresqlImage:
getOrDefault(this.vars.SONATAFLOW_OPERATOR__kogitoDataIndexPostgresqlImage),
+ kogitoDBMigratorToolImage:
getOrDefault(this.vars.SONATAFLOW_OPERATOR__kogitoDBMigratorToolImage),
},
};
},
diff --git a/packages/sonataflow-operator/hack/bump-version.sh
b/packages/sonataflow-operator/hack/bump-version.sh
index 68c7b8585a6..7d26d9375c2 100755
--- a/packages/sonataflow-operator/hack/bump-version.sh
+++ b/packages/sonataflow-operator/hack/bump-version.sh
@@ -44,6 +44,4 @@ node -p "require('replace-in-file').sync({ from: /\bversion:
.*\b/g, to: 'versio
node -p "require('replace-in-file').sync({ from: /\boperatorVersion = .*/g,
to: 'operatorVersion = \"${version}\"', files: ['version/version.go'] });"
node -p "require('replace-in-file').sync({ from: /\btagVersion = .*/g, to:
'tagVersion = \"${imageTag}\"', files: ['version/version.go'] });"
-make generate-all
-
echo "Version bumped to ${version}"
diff --git a/packages/sonataflow-operator/package.json
b/packages/sonataflow-operator/package.json
index 4b23c26befb..d9ab9a25ee9 100644
--- a/packages/sonataflow-operator/package.json
+++ b/packages/sonataflow-operator/package.json
@@ -14,7 +14,7 @@
},
"scripts": {
"build:dev": "run-script-if --bool true --then run-script-os --finally
\"pnpm format\"",
- "build:dev:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && make generate-all &&
make build && pnpm image:build",
+ "build:dev:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && pnpm bump-version &&
make generate-all && make build && pnpm image:build",
"build:dev:win32": "echo 'Build not supported on Windows'",
"build:prod": "run-script-if --bool true --then run-script-os --finally
\"pnpm format\"",
"build:prod:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && make generate-all &&
make build && pnpm image:build && pnpm test && pnpm test-e2e",
@@ -31,7 +31,7 @@
"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\"",
"install": "run-script-os",
- "install:darwin:linux": "rimraf bin && go work sync && go mod tidy && pnpm
controllers:update:cfg && pnpm format && pnpm bump-version && pnpm format",
+ "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'",
"test": "run-script-os",
"test:darwin:linux": ".
./node_modules/@kie-tools/python-venv/venv/bin/activate && run-script-if
--ignore-errors \"$(build-env tests.ignoreFailures)\" --bool \"$(build-env
tests.run)\" --then \"make test\"",
@@ -42,6 +42,7 @@
},
"dependencies": {},
"devDependencies": {
+ "@kie-tools/kogito-db-migrator-tool-image": "workspace:*",
"@kie-tools/python-venv": "workspace:*",
"@kie-tools/root-env": "workspace:*",
"@kie-tools/sonataflow-builder-image": "workspace:*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f965bed5612..99fca1753e4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12606,6 +12606,9 @@ importers:
packages/sonataflow-operator:
devDependencies:
+ '@kie-tools/kogito-db-migrator-tool-image':
+ specifier: workspace:*
+ version: link:../kogito-db-migrator-tool-image
'@kie-tools/python-venv':
specifier: workspace:*
version: link:../python-venv
diff --git a/repo/graph.dot b/repo/graph.dot
index 3a5ffe57add..854bbf62396 100644
--- a/repo/graph.dot
+++ b/repo/graph.dot
@@ -645,6 +645,7 @@ digraph G {
"@kie-tools/sonataflow-management-console-webapp" ->
"@kie-tools/runtime-tools-shared-webapp-components" [ style = "solid", color =
"blue" ];
"@kie-tools/sonataflow-management-console-webapp" ->
"@kie-tools/runtime-tools-swf-webapp-components" [ style = "solid", color =
"blue" ];
"@kie-tools/sonataflow-management-console-webapp" ->
"@kie-tools/sonataflow-dev-app" [ style = "dashed", color = "blue" ];
+ "@kie-tools/sonataflow-operator" ->
"@kie-tools/kogito-db-migrator-tool-image" [ style = "dashed", color = "black"
];
"@kie-tools/sonataflow-operator" -> "@kie-tools/sonataflow-builder-image" [
style = "dashed", color = "black" ];
"@kie-tools/sonataflow-operator" -> "@kie-tools/sonataflow-devmode-image" [
style = "dashed", color = "black" ];
"@kie-tools/sonataflow-operator" -> "@kie/kogito-data-index-ephemeral-image"
[ style = "dashed", color = "black" ];
diff --git a/repo/graph.json b/repo/graph.json
index ecb034a1fa3..3e4c7cb58f0 100644
--- a/repo/graph.json
+++ b/repo/graph.json
@@ -189,6 +189,7 @@
{ "id": "@kie-tools/unitables-dmn" },
{ "id": "@kie-tools/kn-plugin-workflow" },
{ "id": "@kie-tools/sonataflow-operator" },
+ { "id": "@kie-tools/kogito-db-migrator-tool-image" },
{ "id": "@kie-tools/sonataflow-builder-image" },
{ "id": "@kie-tools/sonataflow-devmode-image" },
{ "id": "@kie/kogito-data-index-ephemeral-image" },
@@ -199,7 +200,6 @@
{ "id": "@kie-tools/sonataflow-image-common" },
{ "id": "@kie-tools/python-venv" },
{ "id": "@kie-tools/kogito-db-migrator-tool" },
- { "id": "@kie-tools/kogito-db-migrator-tool-image" },
{ "id": "@kie/kogito-jit-runner-image" },
{ "id": "@kie/kogito-jobs-service-allinone-image" },
{ "id": "@kie-tools/unitables" },
@@ -2048,6 +2048,11 @@
"target": "@kie-tools/sonataflow-operator",
"weight": 1
},
+ {
+ "source": "@kie-tools/sonataflow-operator",
+ "target": "@kie-tools/kogito-db-migrator-tool-image",
+ "weight": 1
+ },
{
"source": "@kie-tools/sonataflow-operator",
"target": "@kie-tools/sonataflow-builder-image",
@@ -2078,6 +2083,16 @@
"target": "@kie/kogito-jobs-service-postgresql-image",
"weight": 1
},
+ {
+ "source": "@kie-tools/kogito-db-migrator-tool-image",
+ "target": "@kie-tools/kogito-db-migrator-tool",
+ "weight": 1
+ },
+ {
+ "source": "@kie-tools/kogito-db-migrator-tool-image",
+ "target": "@kie-tools/sonataflow-image-common",
+ "weight": 1
+ },
{
"source": "@kie-tools/sonataflow-builder-image",
"target": "@kie-tools/maven-base",
@@ -2168,16 +2183,6 @@
"target": "@kie-tools/maven-base",
"weight": 1
},
- {
- "source": "@kie-tools/kogito-db-migrator-tool-image",
- "target": "@kie-tools/kogito-db-migrator-tool",
- "weight": 1
- },
- {
- "source": "@kie-tools/kogito-db-migrator-tool-image",
- "target": "@kie-tools/sonataflow-image-common",
- "weight": 1
- },
{
"source": "@kie/kogito-jit-runner-image",
"target": "@kie-tools/maven-base",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
