Skip to content

Hotfix/zk 3.8.4 jdk21 - #114

Closed
DeliaCraciun wants to merge 5 commits into
release/0.2.15-adobe-20260225-jdkfixfrom
hotfix/zk-3.8.4-jdk21
Closed

DeliaCraciun wants to merge 5 commits into
release/0.2.15-adobe-20260225-jdkfixfrom
hotfix/zk-3.8.4-jdk21

Conversation

@DeliaCraciun

Copy link
Copy Markdown

Change log description

  • Backport all four commits from feat(docker): support alternate authenticated JDK downloads #113 as separate cherry-picks, preserving their authorship and source commit references.
  • Configure Oracle JDK 21.0.13.1 for the ZooKeeper runtime while retaining ZooKeeper 3.8.4.
  • Rebuild both image layers and add runtime verification for the patched JVM.

Purpose of the change

Address CVE-2026-114938 in the ZooKeeper runtime without upgrading the production ZooKeeper server version.

The hotfix starts from production tag 0.2.15-adobe-20260225, not master.

What the code does

  • Includes the complete feat(docker): support alternate authenticated JDK downloads #113 backport: authenticated alternate JDK downloads, major-only mirror paths, runtime-derived helper compilation targets and bare Gradle build support.
  • Adds hotfix configuration and old-release compatibility prerequisites in a separate commit.
  • Configures release and manual validation workflows to download Oracle JDK 21.0.13.1 from the approved Artifactory mirror, using BuildKit secrets and SHA-256 verification.
  • Rebuilds the Apache ZooKeeper base image and pins the final wrapper to its digest during release.
  • Preserves ZooKeeper server 3.8.4 and the existing helper client dependency 3.9.3.
  • Adds smoke checks for the running server's JVM version, readiness and live helper access.

How to verify it

Completed locally:

  • python3 -B -m unittest discover -s scripts -p 'test_*.py' — passed, 15 tests.
  • env -u GOROOT make check — passed.
  • bash -n scripts/zookeeper-version.sh scripts/test-zookeeper-image.sh — passed.
  • git diff --check — passed.
  • Full base and wrapper builds, followed by runtime smoke checks — passed on native ARM64 and emulated AMD64. Both running servers reported Oracle JDK 21.0.13.1+4-LTS-22 and ZooKeeper 3.8.4; readiness, helper access and shutdown succeeded.

Before release:

  • Configure or grant access to JAVA_DOWNLOAD_BASE_URL and JAVA_DOWNLOAD_APIKEY.
  • Run the zookeeper-images workflow on the reviewed hotfix ref for native AMD64 and ARM64 validation.
  • Resolve the separate JDK 25 builder patch level: the locally observed builder uses Temurin 25.0.5+8. This builder is not included in the final runtime image.
  • Validate a quorum-preserving rolling restart in staging. No Kubernetes rollout has been performed.

amuraru and others added 5 commits November 18, 2026 15:48
Port alternate Java download sources and optional BuildKit-secret authentication from adobe/koperator#403. Upgrade the ZooKeeper base image to Debian Trixie while retaining Oracle and Java 25 defaults.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit 9d3330b)
Use the documented major-only layout for alternate JDK mirrors. Compile the zu helper to Java 21 bytecode while retaining JDK 25 as the builder and default runtime, and keep image descriptions accurate for alternate runtimes.

Validated the complete amd64 image with authenticated Oracle JDK 21.0.13.1+4 downloads, ZooKeeper startup and live zu client access.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit 90bafb9)
Keep java_version in the base Dockerfile as the single runtime setting. Read the selected base JDK release metadata in the native helper builder and use one Gradle property for Java source/target compatibility and the Kotlin JVM target.

Verified full Java 21 and Java 25 image builds, matching helper bytecode versions, ZooKeeper startup and live helper operations; all 35 build-script tests pass.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit 9a20f30)
Default javaVersion lazily from the base Dockerfile when no explicit Gradle property is supplied. This restores the CodeQL ./gradlew build command while retaining Java 25 as the shared runtime and compilation default. Docker builds continue to derive targets from the selected base image.

Verified bare Gradle build, explicit Java 21 override, full Java 25 image/runtime smoke tests and 35 script regression tests.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
(cherry picked from commit b56b277)
Add production hotfix settings on top of all four separately cherry-picked commits from #113. Keep the donor download implementation, dynamic helper targets, original test names and test contents unchanged.

Select approved Oracle JDK 21.0.13.1, rebuild the Apache base and pin the wrapper to its digest. Preserve ZooKeeper server 3.8.4, the deployed helper client dependency 3.9.3 and all existing service source code.

Restore upstream build prerequisites missing from the old release: the shared version resolver and helper shell function, plus the Gradle/Kotlin/Shadow toolchain required by the retained JDK 25 native builder. Java and Kotlin bytecode targets still follow the selected Java 21 runtime.

Configure trusted manual image validation with the same Artifactory override and add exact Oracle 21.0.13.1+4 process checks and live ZooKeeper/helper smoke tests for both architectures. Retain the old tag-push publishing trigger and document prerequisites; no tag or image is published by this commit.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants