From 2566edfb9cecb1b824d7b7b356a68890a0d87ae4 Mon Sep 17 00:00:00 2001 From: chen21019 <19357113+chen21019@users.noreply.github.com> Date: Mon, 31 Aug 2026 15:21:33 +0800 Subject: [PATCH] Record service container restart events --- .github/workflows/codeql-verification.yml | 2 +- README.md | 4 +- code/framework/api-pub-sub-jetty/pom.xml | 2 +- code/framework/api-pub-sub/pom.xml | 2 +- code/framework/api/pom.xml | 2 +- code/framework/archaius/pom.xml | 2 +- code/framework/async/pom.xml | 2 +- code/framework/auditing/pom.xml | 2 +- code/framework/db-loader/pom.xml | 2 +- code/framework/deferred/pom.xml | 2 +- code/framework/encryption/pom.xml | 2 +- code/framework/engine/pom.xml | 2 +- code/framework/eventing/pom.xml | 2 +- code/framework/events/pom.xml | 2 +- code/framework/extension-spring/pom.xml | 2 +- code/framework/extension/pom.xml | 2 +- code/framework/java-server/pom.xml | 2 +- code/framework/jmx/pom.xml | 2 +- code/framework/jooq/pom.xml | 2 +- code/framework/json/pom.xml | 2 +- code/framework/launcher/pom.xml | 2 +- code/framework/lock/pom.xml | 2 +- code/framework/logback/pom.xml | 2 +- code/framework/managed-context/pom.xml | 2 +- code/framework/metrics/pom.xml | 2 +- code/framework/module/pom.xml | 2 +- code/framework/object/pom.xml | 2 +- code/framework/pool/pom.xml | 2 +- code/framework/resource-monitor/pom.xml | 2 +- code/framework/schema/pom.xml | 2 +- code/framework/server/pom.xml | 2 +- code/framework/spring/pom.xml | 2 +- code/framework/system-task/pom.xml | 2 +- code/framework/token/pom.xml | 2 +- code/framework/utils/pom.xml | 2 +- code/iaas/agent-instance/pom.xml | 2 +- code/iaas/agent-server/pom.xml | 2 +- code/iaas/agent/pom.xml | 2 +- code/iaas/allocator/pom.xml | 2 +- code/iaas/api-logic/pom.xml | 2 +- code/iaas/archaius-management/pom.xml | 2 +- code/iaas/auth-logic/pom.xml | 2 +- code/iaas/bootstrap/pom.xml | 2 +- code/iaas/config-item/api/pom.xml | 2 +- code/iaas/config-item/common/pom.xml | 2 +- code/iaas/config-item/server/pom.xml | 2 +- code/iaas/engine-jooq/pom.xml | 2 +- code/iaas/events/pom.xml | 2 +- code/iaas/external-handler/pom.xml | 2 +- code/iaas/ha/pom.xml | 2 +- code/iaas/healthcheck/pom.xml | 2 +- code/iaas/labels/pom.xml | 2 +- code/iaas/logic-common/pom.xml | 2 +- code/iaas/logic/pom.xml | 2 +- code/iaas/metadata/pom.xml | 2 +- code/iaas/model/pom.xml | 2 +- code/iaas/resource-pool/pom.xml | 2 +- code/iaas/service-discovery/api/pom.xml | 2 +- code/iaas/service-discovery/server/pom.xml | 2 +- .../ServiceInstanceRestartLogPreListener.java | 61 +++++++++++++++++++ ...viceInstanceRestartLogPreListenerTest.java | 27 ++++++++ code/iaas/ssh-common/pom.xml | 2 +- code/iaas/storage-service/pom.xml | 2 +- code/iaas/task-jooq/pom.xml | 2 +- code/implementation/activity-log/pom.xml | 2 +- .../platform/activity/ActivityService.java | 34 +++++++++++ .../activity/ActivityServiceTest.java | 40 ++++++++++++ .../agent-instance-impl/pom.xml | 2 +- code/implementation/docker/api/pom.xml | 2 +- code/implementation/docker/common/pom.xml | 2 +- code/implementation/docker/compute/pom.xml | 2 +- code/implementation/docker/machine/pom.xml | 2 +- code/implementation/docker/storage/pom.xml | 6 +- code/implementation/extension-api/pom.xml | 2 +- code/implementation/hazelcast/common/pom.xml | 2 +- .../implementation/hazelcast/eventing/pom.xml | 2 +- code/implementation/hazelcast/lock/pom.xml | 2 +- code/implementation/host-api/pom.xml | 2 +- code/implementation/host-stats/pom.xml | 2 +- code/implementation/register/pom.xml | 2 +- code/implementation/sample-setup/pom.xml | 2 +- code/implementation/settings-api/pom.xml | 2 +- .../simulator/agent-connection/pom.xml | 2 +- code/implementation/simulator/storage/pom.xml | 2 +- code/implementation/system-stack/pom.xml | 2 +- code/implementation/vm/pom.xml | 2 +- code/meta-parent/pom.xml | 2 +- code/packaging/app-config/pom.xml | 2 +- code/packaging/app/pom.xml | 2 +- code/packaging/bundle/pom.xml | 2 +- .../platform/packaging/SafePathsTest.java | 2 +- code/packaging/dev/pom.xml | 2 +- code/packaging/meta/pom.xml | 2 +- code/parent/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- scripts/build | 2 +- scripts/check-pasturestack-source | 4 +- scripts/check-release-artifact | 2 +- 99 files changed, 261 insertions(+), 99 deletions(-) create mode 100644 code/iaas/service-discovery/server/src/main/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListener.java create mode 100644 code/iaas/service-discovery/server/src/test/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListenerTest.java create mode 100644 code/implementation/activity-log/src/test/java/io/cattle/platform/activity/ActivityServiceTest.java diff --git a/.github/workflows/codeql-verification.yml b/.github/workflows/codeql-verification.yml index b539e1db36..7bf979df1f 100644 --- a/.github/workflows/codeql-verification.yml +++ b/.github/workflows/codeql-verification.yml @@ -31,7 +31,7 @@ jobs: test -z "$(git status --porcelain)" git merge-base --is-ancestor origin/main HEAD test "$(git rev-list --count origin/main..HEAD)" -eq 1 - grep -Fxq ' 0.183.287' code/meta-parent/pom.xml + grep -Fxq ' 0.183.288' code/meta-parent/pom.xml - name: Initialize CodeQL uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8 diff --git a/README.md b/README.md index b5d37060ed..02eb17457b 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ PastureStack is an independent community effort to preserve, audit, and moderniz ## Project status -This source tree produces engine version `0.183.287`. It retains the existing Java 25, Ubuntu 26.04, Maven, Liquibase, MariaDB/MySQL, WebSocket, dependency, concurrency, and runtime-hardening work from the maintained compatibility line. Release builds consume the exact `5.7.3-pasturestack.4` runtime JAR published by [`distributed-cache-runtime`](https://github.com/PastureStack/distributed-cache-runtime/releases/tag/v5.7.3-pasturestack.4), verify its pinned SHA-256 and embedded dependency metadata, and install it only into the build-local Maven repository. Provenance and scope are documented in [`third-party/HAZELCAST.md`](third-party/HAZELCAST.md). +This source tree produces engine version `0.183.288`. It retains the existing Java 25, Ubuntu 26.04, Maven, Liquibase, MariaDB/MySQL, WebSocket, dependency, concurrency, and runtime-hardening work from the maintained compatibility line. Release builds consume the exact `5.7.3-pasturestack.4` runtime JAR published by [`distributed-cache-runtime`](https://github.com/PastureStack/distributed-cache-runtime/releases/tag/v5.7.3-pasturestack.4), verify its pinned SHA-256 and embedded dependency metadata, and install it only into the build-local Maven repository. Provenance and scope are documented in [`third-party/HAZELCAST.md`](third-party/HAZELCAST.md). WebAuthn verification uses WebAuthn4J's maintained `tools.jackson` 3.2 dependency line. The existing platform JSON surface remains on @@ -56,7 +56,7 @@ The gate performs dependency-hygiene checks, builds every Maven module with JDK To create the complete release archive after the gate passes: ```sh -ENGINE_VERSION=0.183.287 bash scripts/build --release +ENGINE_VERSION=0.183.288 bash scripts/build --release bash scripts/check-release-artifact dist/artifacts/cattle.jar ``` diff --git a/code/framework/api-pub-sub-jetty/pom.xml b/code/framework/api-pub-sub-jetty/pom.xml index 3b2db3a7c5..0359888719 100644 --- a/code/framework/api-pub-sub-jetty/pom.xml +++ b/code/framework/api-pub-sub-jetty/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/api-pub-sub/pom.xml b/code/framework/api-pub-sub/pom.xml index 6cb53c30c5..9af471ce42 100644 --- a/code/framework/api-pub-sub/pom.xml +++ b/code/framework/api-pub-sub/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/api/pom.xml b/code/framework/api/pom.xml index 87e2c766f0..8cf56e14e0 100644 --- a/code/framework/api/pom.xml +++ b/code/framework/api/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/archaius/pom.xml b/code/framework/archaius/pom.xml index 63cf47789a..f9ba6c6dad 100644 --- a/code/framework/archaius/pom.xml +++ b/code/framework/archaius/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-meta-parent - 0.183.287 + 0.183.288 ../../meta-parent/pom.xml diff --git a/code/framework/async/pom.xml b/code/framework/async/pom.xml index 1d01f1584a..8d3623f1ac 100644 --- a/code/framework/async/pom.xml +++ b/code/framework/async/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/auditing/pom.xml b/code/framework/auditing/pom.xml index a580a854d6..9336749030 100644 --- a/code/framework/auditing/pom.xml +++ b/code/framework/auditing/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/db-loader/pom.xml b/code/framework/db-loader/pom.xml index 3abe109b40..2bde87ac73 100644 --- a/code/framework/db-loader/pom.xml +++ b/code/framework/db-loader/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/deferred/pom.xml b/code/framework/deferred/pom.xml index 9fe277d200..1fa88be09b 100644 --- a/code/framework/deferred/pom.xml +++ b/code/framework/deferred/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/encryption/pom.xml b/code/framework/encryption/pom.xml index dcfd1a39ed..895da9c68d 100644 --- a/code/framework/encryption/pom.xml +++ b/code/framework/encryption/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/engine/pom.xml b/code/framework/engine/pom.xml index fce2e93885..e51a16c1ab 100644 --- a/code/framework/engine/pom.xml +++ b/code/framework/engine/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/eventing/pom.xml b/code/framework/eventing/pom.xml index 19e8330796..85cc66822e 100644 --- a/code/framework/eventing/pom.xml +++ b/code/framework/eventing/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/events/pom.xml b/code/framework/events/pom.xml index 3265ddcd73..8723b2845a 100644 --- a/code/framework/events/pom.xml +++ b/code/framework/events/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/extension-spring/pom.xml b/code/framework/extension-spring/pom.xml index 23a8479f9b..488d042cb1 100644 --- a/code/framework/extension-spring/pom.xml +++ b/code/framework/extension-spring/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/extension/pom.xml b/code/framework/extension/pom.xml index f3d620cf50..28b4a0671c 100644 --- a/code/framework/extension/pom.xml +++ b/code/framework/extension/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/java-server/pom.xml b/code/framework/java-server/pom.xml index ecc44b7b78..b5f003eb55 100644 --- a/code/framework/java-server/pom.xml +++ b/code/framework/java-server/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/jmx/pom.xml b/code/framework/jmx/pom.xml index 878b0e59d6..0a1102a126 100644 --- a/code/framework/jmx/pom.xml +++ b/code/framework/jmx/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/jooq/pom.xml b/code/framework/jooq/pom.xml index c67009c8d4..9b58c16810 100644 --- a/code/framework/jooq/pom.xml +++ b/code/framework/jooq/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/json/pom.xml b/code/framework/json/pom.xml index a91148286e..996ae5f9f7 100644 --- a/code/framework/json/pom.xml +++ b/code/framework/json/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/launcher/pom.xml b/code/framework/launcher/pom.xml index 544ffe71ee..d1522a2dfe 100644 --- a/code/framework/launcher/pom.xml +++ b/code/framework/launcher/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/lock/pom.xml b/code/framework/lock/pom.xml index 5b5f70ed49..2801586d69 100644 --- a/code/framework/lock/pom.xml +++ b/code/framework/lock/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/logback/pom.xml b/code/framework/logback/pom.xml index 6da9ccd78d..0cbf25e1f1 100644 --- a/code/framework/logback/pom.xml +++ b/code/framework/logback/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-meta-parent - 0.183.287 + 0.183.288 ../../meta-parent/pom.xml diff --git a/code/framework/managed-context/pom.xml b/code/framework/managed-context/pom.xml index 69430a0f3d..af2dd4e017 100644 --- a/code/framework/managed-context/pom.xml +++ b/code/framework/managed-context/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/metrics/pom.xml b/code/framework/metrics/pom.xml index 08a4d5f98f..d6b4ab38a4 100644 --- a/code/framework/metrics/pom.xml +++ b/code/framework/metrics/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/module/pom.xml b/code/framework/module/pom.xml index 8931212ed4..c2b2dcb909 100644 --- a/code/framework/module/pom.xml +++ b/code/framework/module/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/object/pom.xml b/code/framework/object/pom.xml index 9b08e8cbe9..27f766b03f 100644 --- a/code/framework/object/pom.xml +++ b/code/framework/object/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/pool/pom.xml b/code/framework/pool/pom.xml index a1893dbfbb..7c5e3d990a 100644 --- a/code/framework/pool/pom.xml +++ b/code/framework/pool/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/resource-monitor/pom.xml b/code/framework/resource-monitor/pom.xml index 6de9a5c365..6c91be901d 100644 --- a/code/framework/resource-monitor/pom.xml +++ b/code/framework/resource-monitor/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/schema/pom.xml b/code/framework/schema/pom.xml index f9f22cc5e5..be4811324d 100644 --- a/code/framework/schema/pom.xml +++ b/code/framework/schema/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/server/pom.xml b/code/framework/server/pom.xml index dc195e90d7..6d8d6c26cc 100644 --- a/code/framework/server/pom.xml +++ b/code/framework/server/pom.xml @@ -4,7 +4,7 @@ cattle-meta-parent io.cattle - 0.183.287 + 0.183.288 ../../meta-parent/pom.xml diff --git a/code/framework/spring/pom.xml b/code/framework/spring/pom.xml index 7ecb5080a9..1a2f1b8af3 100644 --- a/code/framework/spring/pom.xml +++ b/code/framework/spring/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/system-task/pom.xml b/code/framework/system-task/pom.xml index 0ce9035ca5..e39163ec95 100644 --- a/code/framework/system-task/pom.xml +++ b/code/framework/system-task/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/token/pom.xml b/code/framework/token/pom.xml index 65e65e91db..1043856382 100644 --- a/code/framework/token/pom.xml +++ b/code/framework/token/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/framework/utils/pom.xml b/code/framework/utils/pom.xml index ec356a1eab..86bcacf14f 100644 --- a/code/framework/utils/pom.xml +++ b/code/framework/utils/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/agent-instance/pom.xml b/code/iaas/agent-instance/pom.xml index 353c208dff..a9b917d7c2 100644 --- a/code/iaas/agent-instance/pom.xml +++ b/code/iaas/agent-instance/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/agent-server/pom.xml b/code/iaas/agent-server/pom.xml index 9284f86c5c..a5c37b5467 100644 --- a/code/iaas/agent-server/pom.xml +++ b/code/iaas/agent-server/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/agent/pom.xml b/code/iaas/agent/pom.xml index 397d575321..5fe6809c86 100644 --- a/code/iaas/agent/pom.xml +++ b/code/iaas/agent/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/allocator/pom.xml b/code/iaas/allocator/pom.xml index 9aca355341..c64f1dd05b 100644 --- a/code/iaas/allocator/pom.xml +++ b/code/iaas/allocator/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/api-logic/pom.xml b/code/iaas/api-logic/pom.xml index edd02813c1..eb28cc171e 100644 --- a/code/iaas/api-logic/pom.xml +++ b/code/iaas/api-logic/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/archaius-management/pom.xml b/code/iaas/archaius-management/pom.xml index c23b328b06..cf1d23ec18 100644 --- a/code/iaas/archaius-management/pom.xml +++ b/code/iaas/archaius-management/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/auth-logic/pom.xml b/code/iaas/auth-logic/pom.xml index 27b532cf26..5908a6cf12 100644 --- a/code/iaas/auth-logic/pom.xml +++ b/code/iaas/auth-logic/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/bootstrap/pom.xml b/code/iaas/bootstrap/pom.xml index 09e6fadb41..74e613067c 100644 --- a/code/iaas/bootstrap/pom.xml +++ b/code/iaas/bootstrap/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/config-item/api/pom.xml b/code/iaas/config-item/api/pom.xml index cf6d9657d5..2c7d52c7c0 100644 --- a/code/iaas/config-item/api/pom.xml +++ b/code/iaas/config-item/api/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/iaas/config-item/common/pom.xml b/code/iaas/config-item/common/pom.xml index 84c0ea56eb..e947fe5587 100644 --- a/code/iaas/config-item/common/pom.xml +++ b/code/iaas/config-item/common/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/iaas/config-item/server/pom.xml b/code/iaas/config-item/server/pom.xml index b7cbe40361..d706d9e762 100644 --- a/code/iaas/config-item/server/pom.xml +++ b/code/iaas/config-item/server/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/iaas/engine-jooq/pom.xml b/code/iaas/engine-jooq/pom.xml index 31f19fb854..e8a0f50864 100644 --- a/code/iaas/engine-jooq/pom.xml +++ b/code/iaas/engine-jooq/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/events/pom.xml b/code/iaas/events/pom.xml index 4152eddd71..80b97e22df 100644 --- a/code/iaas/events/pom.xml +++ b/code/iaas/events/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/external-handler/pom.xml b/code/iaas/external-handler/pom.xml index eddcb6234c..96b30fa6d8 100644 --- a/code/iaas/external-handler/pom.xml +++ b/code/iaas/external-handler/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/ha/pom.xml b/code/iaas/ha/pom.xml index 939be3cb68..1ee6578762 100644 --- a/code/iaas/ha/pom.xml +++ b/code/iaas/ha/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/healthcheck/pom.xml b/code/iaas/healthcheck/pom.xml index b893fd0f00..47aa064aab 100644 --- a/code/iaas/healthcheck/pom.xml +++ b/code/iaas/healthcheck/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/labels/pom.xml b/code/iaas/labels/pom.xml index 1cfdc3b9d5..3b15a390da 100644 --- a/code/iaas/labels/pom.xml +++ b/code/iaas/labels/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/logic-common/pom.xml b/code/iaas/logic-common/pom.xml index 4be673ede9..581ff62a19 100644 --- a/code/iaas/logic-common/pom.xml +++ b/code/iaas/logic-common/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/logic/pom.xml b/code/iaas/logic/pom.xml index 960cdf1827..b3dd5aa57f 100644 --- a/code/iaas/logic/pom.xml +++ b/code/iaas/logic/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/metadata/pom.xml b/code/iaas/metadata/pom.xml index ebdabe7f28..f17378ee02 100644 --- a/code/iaas/metadata/pom.xml +++ b/code/iaas/metadata/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/model/pom.xml b/code/iaas/model/pom.xml index 73992ac0e7..54b6e9851a 100644 --- a/code/iaas/model/pom.xml +++ b/code/iaas/model/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/resource-pool/pom.xml b/code/iaas/resource-pool/pom.xml index 1ef01422e6..74901208ae 100644 --- a/code/iaas/resource-pool/pom.xml +++ b/code/iaas/resource-pool/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/service-discovery/api/pom.xml b/code/iaas/service-discovery/api/pom.xml index c90e1a21b6..94287568b9 100644 --- a/code/iaas/service-discovery/api/pom.xml +++ b/code/iaas/service-discovery/api/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/iaas/service-discovery/server/pom.xml b/code/iaas/service-discovery/server/pom.xml index 9d54711251..1e89f22932 100644 --- a/code/iaas/service-discovery/server/pom.xml +++ b/code/iaas/service-discovery/server/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/iaas/service-discovery/server/src/main/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListener.java b/code/iaas/service-discovery/server/src/main/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListener.java new file mode 100644 index 0000000000..a9734f3431 --- /dev/null +++ b/code/iaas/service-discovery/server/src/main/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListener.java @@ -0,0 +1,61 @@ +package io.cattle.platform.servicediscovery.process; + +import io.cattle.platform.activity.ActivityLog; +import io.cattle.platform.activity.ActivityService; +import io.cattle.platform.core.constants.InstanceConstants; +import io.cattle.platform.core.dao.InstanceDao; +import io.cattle.platform.core.model.Instance; +import io.cattle.platform.core.model.Service; +import io.cattle.platform.engine.handler.HandlerResult; +import io.cattle.platform.engine.handler.ProcessPreListener; +import io.cattle.platform.engine.process.ProcessInstance; +import io.cattle.platform.engine.process.ProcessState; +import io.cattle.platform.process.common.handler.AbstractObjectProcessLogic; +import io.cattle.platform.util.type.Priority; + +import java.util.List; + +import jakarta.inject.Inject; +import jakarta.inject.Named; + +import org.apache.commons.lang3.StringUtils; + +@Named +public class ServiceInstanceRestartLogPreListener extends AbstractObjectProcessLogic implements ProcessPreListener, Priority { + + @Inject + InstanceDao instanceDao; + + @Inject + ActivityService activityService; + + @Override + public HandlerResult handle(ProcessState state, ProcessInstance process) { + Instance instance = (Instance) state.getResource(); + if (instance == null || instance.getId() == null) { + return null; + } + + List services = instanceDao.findServicesForInstanceId(instance.getId()); + for (Service service : services) { + activityService.instance(service, instance, "restart", restartDescription(instance), ActivityLog.INFO); + } + + return null; + } + + static String restartDescription(Instance instance) { + String name = instance == null ? null : instance.getName(); + return StringUtils.isBlank(name) ? "Restarting service container" : "Restarting container " + name; + } + + @Override + public String[] getProcessNames() { + return new String[] { InstanceConstants.PROCESS_RESTART }; + } + + @Override + public int getPriority() { + return Priority.DEFAULT; + } +} diff --git a/code/iaas/service-discovery/server/src/test/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListenerTest.java b/code/iaas/service-discovery/server/src/test/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListenerTest.java new file mode 100644 index 0000000000..a9c831b36a --- /dev/null +++ b/code/iaas/service-discovery/server/src/test/java/io/cattle/platform/servicediscovery/process/ServiceInstanceRestartLogPreListenerTest.java @@ -0,0 +1,27 @@ +package io.cattle.platform.servicediscovery.process; + +import static org.junit.Assert.assertEquals; + +import io.cattle.platform.core.model.tables.records.InstanceRecord; + +import org.junit.Test; + +public class ServiceInstanceRestartLogPreListenerTest { + + @Test + public void restartDescriptionUsesHumanReadableContainerName() { + InstanceRecord instance = new InstanceRecord(); + instance.setName("web-1"); + + assertEquals("Restarting container web-1", + ServiceInstanceRestartLogPreListener.restartDescription(instance)); + } + + @Test + public void restartDescriptionHasSafeFallback() { + InstanceRecord instance = new InstanceRecord(); + + assertEquals("Restarting service container", + ServiceInstanceRestartLogPreListener.restartDescription(instance)); + } +} diff --git a/code/iaas/ssh-common/pom.xml b/code/iaas/ssh-common/pom.xml index bfb3ec3fb5..60328fb4b7 100644 --- a/code/iaas/ssh-common/pom.xml +++ b/code/iaas/ssh-common/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/storage-service/pom.xml b/code/iaas/storage-service/pom.xml index e98c038f8d..547a8297b4 100644 --- a/code/iaas/storage-service/pom.xml +++ b/code/iaas/storage-service/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/iaas/task-jooq/pom.xml b/code/iaas/task-jooq/pom.xml index 2570196b85..10487d2220 100644 --- a/code/iaas/task-jooq/pom.xml +++ b/code/iaas/task-jooq/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/activity-log/pom.xml b/code/implementation/activity-log/pom.xml index 5101842167..0152ea0942 100644 --- a/code/implementation/activity-log/pom.xml +++ b/code/implementation/activity-log/pom.xml @@ -5,7 +5,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/activity-log/src/main/java/io/cattle/platform/activity/ActivityService.java b/code/implementation/activity-log/src/main/java/io/cattle/platform/activity/ActivityService.java index ead085364f..dd772f3bc4 100644 --- a/code/implementation/activity-log/src/main/java/io/cattle/platform/activity/ActivityService.java +++ b/code/implementation/activity-log/src/main/java/io/cattle/platform/activity/ActivityService.java @@ -3,8 +3,12 @@ import io.cattle.platform.activity.impl.ActivityLogImpl; import io.cattle.platform.core.model.Instance; import io.cattle.platform.core.model.Service; +import io.cattle.platform.core.model.ServiceLog; import io.cattle.platform.eventing.EventService; import io.cattle.platform.object.ObjectManager; +import io.cattle.platform.object.util.ObjectUtils; + +import java.util.Date; import jakarta.inject.Inject; @@ -55,4 +59,34 @@ public void instance(Instance instance, String operation, String reason, String } activityLog.instance(instance, operation, reason, level); } + + /** + * Records an instance operation even when it was initiated outside a service activity context, + * such as a user restarting a service-managed container directly. + */ + public void instance(Service service, Instance instance, String operation, String reason, String level) { + if (service == null || instance == null) { + return; + } + + ServiceLog log = objectManager.newRecord(ServiceLog.class); + populateInstanceLog(log, service, instance, operation, reason, level, + new Date(), io.cattle.platform.util.resource.UUID.randomUUID().toString()); + objectManager.create(log); + ObjectUtils.publishChanged(eventService, objectManager, log); + } + + static void populateInstanceLog(ServiceLog log, Service service, Instance instance, String operation, + String reason, String level, Date timestamp, String transactionId) { + log.setAccountId(service.getAccountId()); + log.setServiceId(service.getId()); + log.setInstanceId(instance.getId()); + log.setEventType("service.instance." + operation); + log.setDescription(reason); + log.setLevel(level); + log.setCreated(timestamp); + log.setEndTime(timestamp); + log.setTransactionId(transactionId); + log.setSubLog(false); + } } diff --git a/code/implementation/activity-log/src/test/java/io/cattle/platform/activity/ActivityServiceTest.java b/code/implementation/activity-log/src/test/java/io/cattle/platform/activity/ActivityServiceTest.java new file mode 100644 index 0000000000..cc9bfecacc --- /dev/null +++ b/code/implementation/activity-log/src/test/java/io/cattle/platform/activity/ActivityServiceTest.java @@ -0,0 +1,40 @@ +package io.cattle.platform.activity; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import io.cattle.platform.core.model.tables.records.InstanceRecord; +import io.cattle.platform.core.model.tables.records.ServiceLogRecord; +import io.cattle.platform.core.model.tables.records.ServiceRecord; + +import java.util.Date; + +import org.junit.Test; + +public class ActivityServiceTest { + + @Test + public void populateInstanceLogBindsServiceAndInstanceIdentity() { + ServiceRecord service = new ServiceRecord(); + service.setId(42L); + service.setAccountId(5L); + InstanceRecord instance = new InstanceRecord(); + instance.setId(99L); + ServiceLogRecord log = new ServiceLogRecord(); + Date timestamp = new Date(123456789L); + + ActivityService.populateInstanceLog(log, service, instance, "restart", "Restarting container web-1", + ActivityLog.INFO, timestamp, "transaction-1"); + + assertEquals(Long.valueOf(5L), log.getAccountId()); + assertEquals(Long.valueOf(42L), log.getServiceId()); + assertEquals(Long.valueOf(99L), log.getInstanceId()); + assertEquals("service.instance.restart", log.getEventType()); + assertEquals("Restarting container web-1", log.getDescription()); + assertEquals(ActivityLog.INFO, log.getLevel()); + assertEquals(timestamp, log.getCreated()); + assertEquals(timestamp, log.getEndTime()); + assertEquals("transaction-1", log.getTransactionId()); + assertFalse(log.getSubLog()); + } +} diff --git a/code/implementation/agent-instance-impl/pom.xml b/code/implementation/agent-instance-impl/pom.xml index 8f9f0e3c5d..5c4edc87bf 100644 --- a/code/implementation/agent-instance-impl/pom.xml +++ b/code/implementation/agent-instance-impl/pom.xml @@ -3,7 +3,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml cattle-agent-instance-impl diff --git a/code/implementation/docker/api/pom.xml b/code/implementation/docker/api/pom.xml index deadf317fb..a6b55ec609 100644 --- a/code/implementation/docker/api/pom.xml +++ b/code/implementation/docker/api/pom.xml @@ -5,7 +5,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/docker/common/pom.xml b/code/implementation/docker/common/pom.xml index a84bbbda79..a0628c1819 100644 --- a/code/implementation/docker/common/pom.xml +++ b/code/implementation/docker/common/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/docker/compute/pom.xml b/code/implementation/docker/compute/pom.xml index e05bee6a7c..cb4d6bd108 100644 --- a/code/implementation/docker/compute/pom.xml +++ b/code/implementation/docker/compute/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/docker/machine/pom.xml b/code/implementation/docker/machine/pom.xml index 4fed231d16..f579d0bdbc 100644 --- a/code/implementation/docker/machine/pom.xml +++ b/code/implementation/docker/machine/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/docker/storage/pom.xml b/code/implementation/docker/storage/pom.xml index a66fe936a6..8883520447 100644 --- a/code/implementation/docker/storage/pom.xml +++ b/code/implementation/docker/storage/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml @@ -21,12 +21,12 @@ io.cattle cattle-docker-common - 0.183.287 + 0.183.288 io.cattle cattle-iaas-allocator - 0.183.287 + 0.183.288 diff --git a/code/implementation/extension-api/pom.xml b/code/implementation/extension-api/pom.xml index 06b5bac3d9..a84e416e50 100644 --- a/code/implementation/extension-api/pom.xml +++ b/code/implementation/extension-api/pom.xml @@ -3,7 +3,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml cattle-extension-api diff --git a/code/implementation/hazelcast/common/pom.xml b/code/implementation/hazelcast/common/pom.xml index b41bdab622..9b0504285b 100644 --- a/code/implementation/hazelcast/common/pom.xml +++ b/code/implementation/hazelcast/common/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/hazelcast/eventing/pom.xml b/code/implementation/hazelcast/eventing/pom.xml index 7e12aa221b..9b87824b86 100644 --- a/code/implementation/hazelcast/eventing/pom.xml +++ b/code/implementation/hazelcast/eventing/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/hazelcast/lock/pom.xml b/code/implementation/hazelcast/lock/pom.xml index b46343892e..38f4704631 100644 --- a/code/implementation/hazelcast/lock/pom.xml +++ b/code/implementation/hazelcast/lock/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/host-api/pom.xml b/code/implementation/host-api/pom.xml index 3d40ea19b7..1fff205788 100644 --- a/code/implementation/host-api/pom.xml +++ b/code/implementation/host-api/pom.xml @@ -5,7 +5,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/host-stats/pom.xml b/code/implementation/host-stats/pom.xml index 4744c83616..6dd4b1b519 100644 --- a/code/implementation/host-stats/pom.xml +++ b/code/implementation/host-stats/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/register/pom.xml b/code/implementation/register/pom.xml index 6fc169a776..e8afdf8e03 100644 --- a/code/implementation/register/pom.xml +++ b/code/implementation/register/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/sample-setup/pom.xml b/code/implementation/sample-setup/pom.xml index 5bb546a69b..764379579c 100644 --- a/code/implementation/sample-setup/pom.xml +++ b/code/implementation/sample-setup/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/settings-api/pom.xml b/code/implementation/settings-api/pom.xml index 79dc46bd23..7c3a2e971f 100644 --- a/code/implementation/settings-api/pom.xml +++ b/code/implementation/settings-api/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/simulator/agent-connection/pom.xml b/code/implementation/simulator/agent-connection/pom.xml index c0f393a29b..892f4df419 100644 --- a/code/implementation/simulator/agent-connection/pom.xml +++ b/code/implementation/simulator/agent-connection/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/simulator/storage/pom.xml b/code/implementation/simulator/storage/pom.xml index 386aaa4f0d..1410e265ad 100644 --- a/code/implementation/simulator/storage/pom.xml +++ b/code/implementation/simulator/storage/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../../parent/pom.xml diff --git a/code/implementation/system-stack/pom.xml b/code/implementation/system-stack/pom.xml index cf1c9ce7ae..910111d577 100644 --- a/code/implementation/system-stack/pom.xml +++ b/code/implementation/system-stack/pom.xml @@ -5,7 +5,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/implementation/vm/pom.xml b/code/implementation/vm/pom.xml index dc0b2fcd69..9f7a91675e 100644 --- a/code/implementation/vm/pom.xml +++ b/code/implementation/vm/pom.xml @@ -3,7 +3,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml cattle-vm diff --git a/code/meta-parent/pom.xml b/code/meta-parent/pom.xml index 5552acd863..cd27c5e542 100644 --- a/code/meta-parent/pom.xml +++ b/code/meta-parent/pom.xml @@ -9,7 +9,7 @@ 4.0.0 io.cattle cattle-meta-parent - 0.183.287 + 0.183.288 pom PastureStack Orchestration Engine Compatibility orchestration engine for the PastureStack server. diff --git a/code/packaging/app-config/pom.xml b/code/packaging/app-config/pom.xml index acd514ea8a..5a4dabf553 100644 --- a/code/packaging/app-config/pom.xml +++ b/code/packaging/app-config/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml jar diff --git a/code/packaging/app/pom.xml b/code/packaging/app/pom.xml index 69d7390ee7..45b603516d 100644 --- a/code/packaging/app/pom.xml +++ b/code/packaging/app/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml war diff --git a/code/packaging/bundle/pom.xml b/code/packaging/bundle/pom.xml index a3912939a3..e7a2f182f8 100644 --- a/code/packaging/bundle/pom.xml +++ b/code/packaging/bundle/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/packaging/bundle/src/test/java/io/cattle/platform/packaging/SafePathsTest.java b/code/packaging/bundle/src/test/java/io/cattle/platform/packaging/SafePathsTest.java index 9efd01e25a..3839dfeaf3 100644 --- a/code/packaging/bundle/src/test/java/io/cattle/platform/packaging/SafePathsTest.java +++ b/code/packaging/bundle/src/test/java/io/cattle/platform/packaging/SafePathsTest.java @@ -63,7 +63,7 @@ public void rejectsRootResourcePrefixCollision() throws Exception { @Test public void acceptsNumericMaintenanceVersion() throws Exception { - assertEquals("0.183.287", SafePaths.version("0.183.287")); + assertEquals("0.183.288", SafePaths.version("0.183.288")); } @Test diff --git a/code/packaging/dev/pom.xml b/code/packaging/dev/pom.xml index 94971636f3..be5ed55f01 100644 --- a/code/packaging/dev/pom.xml +++ b/code/packaging/dev/pom.xml @@ -4,7 +4,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/packaging/meta/pom.xml b/code/packaging/meta/pom.xml index 6f0b0dfbab..4fa58bded8 100644 --- a/code/packaging/meta/pom.xml +++ b/code/packaging/meta/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../../parent/pom.xml diff --git a/code/parent/pom.xml b/code/parent/pom.xml index 0b40c4b64c..d82341ff7c 100644 --- a/code/parent/pom.xml +++ b/code/parent/pom.xml @@ -5,7 +5,7 @@ io.cattle cattle-meta-parent ../meta-parent/pom.xml - 0.183.287 + 0.183.288 pom diff --git a/pom.xml b/pom.xml index 592dc97142..880d0ac785 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.cattle cattle-parent - 0.183.287 + 0.183.288 code/parent/pom.xml cattle diff --git a/resources/pom.xml b/resources/pom.xml index cdaa656e2c..5daf06d470 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ cattle-parent io.cattle - 0.183.287 + 0.183.288 ../code/parent/pom.xml diff --git a/scripts/build b/scripts/build index 0b406db22d..dbeaac6616 100755 --- a/scripts/build +++ b/scripts/build @@ -16,7 +16,7 @@ fi SOURCE_REVISION=${SOURCE_REVISION:-$(git rev-parse HEAD)} SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH:-$(git show -s --format=%ct HEAD)} -ENGINE_VERSION=${ENGINE_VERSION:-0.183.287} +ENGINE_VERSION=${ENGINE_VERSION:-0.183.288} case "$SOURCE_REVISION" in ''|*[!0-9a-f]*) diff --git a/scripts/check-pasturestack-source b/scripts/check-pasturestack-source index c948cf7544..fa9ee82d6a 100755 --- a/scripts/check-pasturestack-source +++ b/scripts/check-pasturestack-source @@ -41,7 +41,7 @@ fi project_version=$(sed -n 's/^[[:space:]]*\([^<]*\)<\/version>[[:space:]]*$/\1/p' code/meta-parent/pom.xml | head -n 1) [[ "$project_version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || fail non_numeric_project_version -require_line code/meta-parent/pom.xml ' 0.183.287' +require_line code/meta-parent/pom.xml ' 0.183.288' require_line code/meta-parent/pom.xml ' https://github.com/PastureStack/orchestration-engine' require_line Dockerfile 'FROM ubuntu:26.04@sha256:2260313b31c8c011cd2eebe728008efac1b3982be73eb71348ea2648d2c0e09b' require_line Dockerfile.dapper 'FROM ubuntu:26.04@sha256:2260313b31c8c011cd2eebe728008efac1b3982be73eb71348ea2648d2c0e09b' @@ -300,4 +300,4 @@ fi require_line README.md 'PastureStack is an independent community effort to preserve, audit, and modernize the Rancher 1.6 ecosystem. It is not affiliated with or endorsed by Rancher Labs or SUSE.' require_line ORIGIN.md '- Preserved upstream boundary: `82d154a53f4089fecfb9f320caad826bb4f6055f`' -printf 'PASTURESTACK_SOURCE_GATE_OK version=0.183.287 runtime_sources=github_release images=digest_pinned ubuntu=26.04 ubuntu_snapshot=20260826T000000Z jdk=25.0.4 maven=3.9.16 patched_hazelcast=5.7.3-pasturestack.4 docker=29.7.2 credential_secret_capacity=mediumtext port_preflight=authoritative volume_preflight=authoritative volume_preflight_project_schema=authorized volume_preflight_type_set=registered\n' +printf 'PASTURESTACK_SOURCE_GATE_OK version=0.183.288 runtime_sources=github_release images=digest_pinned ubuntu=26.04 ubuntu_snapshot=20260826T000000Z jdk=25.0.4 maven=3.9.16 patched_hazelcast=5.7.3-pasturestack.4 docker=29.7.2 credential_secret_capacity=mediumtext port_preflight=authoritative volume_preflight=authoritative volume_preflight_project_schema=authorized volume_preflight_type_set=registered\n' diff --git a/scripts/check-release-artifact b/scripts/check-release-artifact index cf712a4cc4..efd269038c 100755 --- a/scripts/check-release-artifact +++ b/scripts/check-release-artifact @@ -4,7 +4,7 @@ set -euo pipefail cd "$(dirname "$0")/.." artifact=${1:-dist/artifacts/cattle.jar} -expected_version=${EXPECTED_ENGINE_VERSION:-0.183.287} +expected_version=${EXPECTED_ENGINE_VERSION:-0.183.288} test -f "$artifact" artifact=$(realpath "$artifact")