Skip to content

Commit 39d6196

Browse files
authored
Merge branch 'main' into feat/add-openlineage-spark
2 parents d90a00f + de5c21f commit 39d6196

19 files changed

Lines changed: 578 additions & 7 deletions

File tree

.github/ISSUE_TEMPLATE/update-product-hbase-phoenix-omid.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Add/Change/Remove anything that isn't applicable anymore
3333
- [ ] Upload new versions (see the `hbase/*.sh` scripts).
3434
- [ ] Update `boil-config.toml` to the latest supported version of JVM (base and devel).
3535
- [ ] Update `boil-config.toml` to the latest supported version of Hadoop.
36+
- [ ] Update `boil-config.toml` of spark-k8s/hbase-connectors to the latest supported version of HBase, hbase-thridparty and protobuf.
3637
- [ ] Update other dependencies if applicable (eg: phoenix, opa_authorizer, etc).
3738
- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR to the list below.
3839

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [26.7.0] - 2026-07-21
8+
9+
## [26.7.0-rc2] - 2026-07-20
10+
11+
## [26.7.0-rc1] - 2026-07-16
12+
713
### Added
814

915
- ci: Generate SLSA build provenance for published image indexes and attest it in each registry ([#1559]).
@@ -27,6 +33,8 @@ All notable changes to this project will be documented in this file.
2733
- spark: Add the OpenLineage listener under the dedicated directory `/stackable/spark/openlineage/` ([#1577]).
2834
- opensearch: Add `3.6.0` ([#1549]).
2935
- opensearch-dashboards: Add `3.6.0` ([#1551]).
36+
- spark: Add hbase-connector protobuf classes ([#1573]).
37+
- java-base: Add `jvmkill` ([#1579], [#1580]).
3038

3139
### Changed
3240

@@ -43,6 +51,7 @@ All notable changes to this project will be documented in this file.
4351
- hive: Bump `4.2.0` to Hadoop `3.4.3` ([#1539]).
4452
- java-devel: Bump Maven to 3.9.16 ([#1548]).
4553
- spark: fix graceful shutdown at SIGTERM ([#1564])
54+
- spark-k8s/hbase-connectors: bump hbase to 2.6.6 ([#1573]).
4655

4756
### Fixed
4857

@@ -101,6 +110,8 @@ All notable changes to this project will be documented in this file.
101110
[#1559]: https://github.com/stackabletech/docker-images/pull/1559
102111
[#1561]: https://github.com/stackabletech/docker-images/pull/1561
103112
[#1564]: https://github.com/stackabletech/docker-images/pull/1564
113+
[#1579]: https://github.com/stackabletech/docker-images/pull/1579
114+
[#1580]: https://github.com/stackabletech/docker-images/pull/1580
104115

105116
## [26.3.0] - 2026-03-16
106117

java-base/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
#
55
# Provides the common Java Runtime for SDP products
66
#
7+
FROM local-image/java-base/jvmkill AS jvmkill-builder
78
FROM local-image/vector
89

910
ARG PRODUCT_VERSION
11+
ARG STACKABLE_USER_UID
1012
ARG RELEASE_VERSION="1"
1113

1214
LABEL name="Stackable image for OpenJDK" \
@@ -57,3 +59,8 @@ ENV JAVA_VERSION=$PRODUCT_VERSION
5759
# This variable is supported as of Log4j version 2.10 and
5860
# disables the vulnerable feature
5961
ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
62+
63+
# We are adding jvmkill, as it improves shutdown of the JVM in case it runs out of native threads.
64+
# See https://github.com/stackabletech/docker-images/issues/1578 for motivation/details.
65+
COPY --chown=${STACKABLE_USER_UID}:0 --from=jvmkill-builder /stackable/libjvmkill.so /stackable/libjvmkill.so
66+
RUN chmod g=u /stackable/libjvmkill.so

java-base/boil-config.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
[versions."11".local-images]
22
vector = "0.55.0"
3+
"java-base/jvmkill" = "0e410d8-java-11"
34

45
[versions."17".local-images]
56
vector = "0.55.0"
7+
"java-base/jvmkill" = "0e410d8-java-17"
68

79
[versions."21".local-images]
810
vector = "0.55.0"
11+
"java-base/jvmkill" = "0e410d8-java-21"
912

1013
[versions."24".local-images]
1114
vector = "0.55.0"
15+
"java-base/jvmkill" = "0e410d8-java-24"
1216

1317
[versions."25".local-images]
1418
vector = "0.55.0"
19+
"java-base/jvmkill" = "0e410d8-java-25"

java-base/jvmkill/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM local-image/java-devel
2+
3+
ARG JVMKILL_VERSION
4+
5+
WORKDIR /stackable
6+
7+
COPY --chown=0:0 java-base/jvmkill/stackable/patches/patchable.toml /stackable/src/java-base/jvmkill/stackable/patches/patchable.toml
8+
COPY --chown=0:0 java-base/jvmkill/stackable/patches/${JVMKILL_VERSION} /stackable/src/java-base/jvmkill/stackable/patches/${JVMKILL_VERSION}
9+
10+
RUN <<EOF
11+
cd "$(/stackable/patchable --images-repo-root=src checkout java-base/jvmkill ${JVMKILL_VERSION})"
12+
13+
make
14+
15+
cp libjvmkill.so /stackable/libjvmkill.so
16+
17+
# Clean up build artifacts and temporary files to reduce image size
18+
cd /stackable
19+
rm -rf ./src
20+
EOF

java-base/jvmkill/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# jvmkill
2+
3+
Note: There are no upstream tags or releases, so we use the commit hash as release.
4+
5+
We are using <https://github.com/airlift/jvmkill> over <https://github.com/cloudfoundry/jvmkill>.
6+
7+
`cloudfoundry/jvmkill` is re-written in Rust, but hasn't seen a commit since 4 years.
8+
Also, the official Trino docker image uses `airlift/jvmkill` as well.

java-base/jvmkill/boil-config.toml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[versions."0e410d8-java-11".local-images]
2+
java-devel = "11"
3+
[versions."0e410d8-java-11".build-arguments]
4+
jvmkill-version = "0e410d8"
5+
6+
[versions."0e410d8-java-17".local-images]
7+
java-devel = "17"
8+
[versions."0e410d8-java-17".build-arguments]
9+
jvmkill-version = "0e410d8"
10+
11+
[versions."0e410d8-java-21".local-images]
12+
java-devel = "21"
13+
[versions."0e410d8-java-21".build-arguments]
14+
jvmkill-version = "0e410d8"
15+
16+
[versions."0e410d8-java-24".local-images]
17+
java-devel = "24"
18+
[versions."0e410d8-java-24".build-arguments]
19+
jvmkill-version = "0e410d8"
20+
21+
[versions."0e410d8-java-25".local-images]
22+
java-devel = "25"
23+
[versions."0e410d8-java-25".build-arguments]
24+
jvmkill-version = "0e410d8"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mirror = "https://github.com/stackabletech/jvmkill.git"
2+
base = "0e410d875e2f4b5d5dfc74d3c145f771bfd69cc2"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
upstream = "https://github.com/airlift/jvmkill.git"
2+
default-mirror = "https://github.com/stackabletech/jvmkill.git"

java-base/licenses/JVMKILL_LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)