Skip to content

Commit a225be6

Browse files
committed
Merge remote-tracking branch 'origin/main' into refactor/remove-product-config
2 parents 0957779 + bf33948 commit a225be6

8 files changed

Lines changed: 25 additions & 19 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77
### Added
88

99
- BREAKING: Add required CLI argument and env var to set the image repository used to construct final product image names: `IMAGE_REPOSITORY` (`--image-repository`), eg. `oci.example.org/my/namespace` ([#778]).
10+
- Add support for Hadoop `3.5.0` and `3.4.3` ([#793]).
1011

1112
### Changed
1213

@@ -27,6 +28,7 @@ All notable changes to this project will be documented in this file.
2728
[#783]: https://github.com/stackabletech/hdfs-operator/pull/783
2829
[#787]: https://github.com/stackabletech/hdfs-operator/pull/787
2930
[#790]: https://github.com/stackabletech/hdfs-operator/pull/790
31+
[#793]: https://github.com/stackabletech/hdfs-operator/pull/793
3032

3133
## [26.3.0] - 2026-03-16
3234

docs/modules/hdfs/examples/getting_started/hdfs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-hdfs
66
spec:
77
image:
8-
productVersion: 3.4.2
8+
productVersion: 3.5.0
99
clusterConfig:
1010
zookeeperConfigMapName: simple-hdfs-znode
1111
dfsReplication: 1

docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-hdfs
66
spec:
77
image:
8-
productVersion: 3.4.2
8+
productVersion: 3.5.0
99
clusterConfig:
1010
zookeeperConfigMapName: simple-hdfs-znode
1111
dfsReplication: 1

docs/modules/hdfs/partials/supported-versions.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
// This is a separate file, since it is used by both the direct HDFS-Operator documentation, and the overarching
33
// Stackable Platform documentation.
44

5-
- 3.4.2 (LTS)
5+
- 3.5.0 (LTS)
6+
- 3.4.3
7+
- 3.4.2 (deprecated)

rust/operator-binary/src/controller/build/jvm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ mod tests {
121121
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
122122
spec:
123123
image:
124-
productVersion: 3.4.2
124+
productVersion: 3.5.0
125125
clusterConfig:
126126
zookeeperConfigMapName: hdfs-zk
127127
nameNodes:
@@ -151,7 +151,7 @@ mod tests {
151151
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
152152
spec:
153153
image:
154-
productVersion: 3.4.2
154+
productVersion: 3.5.0
155155
clusterConfig:
156156
zookeeperConfigMapName: hdfs-zk
157157
nameNodes:

rust/operator-binary/src/crd/affinity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ metadata:
6060
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
6161
spec:
6262
image:
63-
productVersion: 3.4.2
63+
productVersion: 3.5.0
6464
clusterConfig:
6565
zookeeperConfigMapName: hdfs-zk
6666
journalNodes:

rust/operator-binary/src/crd/mod.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ metadata:
960960
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
961961
spec:
962962
image:
963-
productVersion: 3.4.2
963+
productVersion: 3.5.0
964964
clusterConfig:
965965
zookeeperConfigMapName: hdfs-zk
966966
dataNodes:
@@ -995,7 +995,7 @@ metadata:
995995
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
996996
spec:
997997
image:
998-
productVersion: 3.4.2
998+
productVersion: 3.5.0
999999
clusterConfig:
10001000
zookeeperConfigMapName: hdfs-zk
10011001
dataNodes:
@@ -1030,7 +1030,7 @@ metadata:
10301030
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
10311031
spec:
10321032
image:
1033-
productVersion: 3.4.2
1033+
productVersion: 3.5.0
10341034
clusterConfig:
10351035
zookeeperConfigMapName: hdfs-zk
10361036
dataNodes:
@@ -1060,7 +1060,7 @@ metadata:
10601060
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
10611061
spec:
10621062
image:
1063-
productVersion: 3.4.2
1063+
productVersion: 3.5.0
10641064
clusterConfig:
10651065
zookeeperConfigMapName: hdfs-zk
10661066
rackAwareness:
@@ -1123,7 +1123,7 @@ metadata:
11231123
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
11241124
spec:
11251125
image:
1126-
productVersion: 3.4.2
1126+
productVersion: 3.5.0
11271127
clusterConfig:
11281128
zookeeperConfigMapName: hdfs-zk
11291129
dataNodes:
@@ -1174,7 +1174,7 @@ metadata:
11741174
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
11751175
spec:
11761176
image:
1177-
productVersion: 3.4.2
1177+
productVersion: 3.5.0
11781178
clusterConfig:
11791179
zookeeperConfigMapName: hdfs-zk
11801180
dataNodes:
@@ -1225,7 +1225,7 @@ metadata:
12251225
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
12261226
spec:
12271227
image:
1228-
productVersion: 3.4.2
1228+
productVersion: 3.5.0
12291229
clusterConfig:
12301230
zookeeperConfigMapName: hdfs-zk
12311231
dataNodes:
@@ -1254,7 +1254,7 @@ metadata:
12541254
uid: 8047b73b-db0f-4281-811f-de59105ae6bf
12551255
spec:
12561256
image:
1257-
productVersion: 3.4.2
1257+
productVersion: 3.5.0
12581258
clusterConfig:
12591259
zookeeperConfigMapName: hdfs-zk
12601260
rackAwareness:
@@ -1290,7 +1290,7 @@ spec:
12901290
fn roundtrip_test_data() -> Vec<Self> {
12911291
stackable_operator::utils::yaml_from_str_singleton_map(indoc::indoc! {r#"
12921292
- image:
1293-
productVersion: 3.4.2
1293+
productVersion: 3.5.0
12941294
pullPolicy: IfNotPresent
12951295
clusterOperation:
12961296
reconciliationPaused: false

tests/test-definition.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ dimensions:
33
- name: hadoop
44
values:
55
- 3.4.2
6+
- 3.4.3
7+
- 3.5.0
68
# To use a custom image, add a comma and the full name after the product version
7-
# - 3.4.2,oci.stackable.tech/sandbox/hadoop:3.4.2-stackable0.0.0-dev
9+
# - 3.5.0,oci.stackable.tech/sandbox/hadoop:3.5.0-stackable0.0.0-dev
810
- name: hadoop-latest
911
values:
10-
- 3.4.2
12+
- 3.5.0
1113
# To use a custom image, add a comma and the full name after the product version
12-
# - 3.4.2,oci.stackable.tech/sandbox/hadoop:3.4.2-stackable0.0.0-dev
14+
# - 3.5.0,oci.stackable.tech/sandbox/hadoop:3.5.0-stackable0.0.0-dev
1315
- name: hadoop-external-client-docker-image
1416
values:
15-
- 3.4.2
17+
- 3.5.0
1618
- name: zookeeper
1719
values:
1820
- 3.9.5

0 commit comments

Comments
 (0)