From 35e42b04da25b5dcb4d2c565adc8e2e000fa590c Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Wed, 12 Mar 2025 12:04:02 +0100 Subject: [PATCH 1/6] update test and doc versions --- .../hdfs/examples/getting_started/hdfs.yaml | 2 +- .../hdfs/examples/getting_started/hdfs.yaml.j2 | 2 +- .../hdfs/pages/usage-guide/upgrading.adoc | 8 ++++---- .../hdfs/partials/supported-versions.adoc | 3 ++- rust/operator-binary/src/config/jvm.rs | 4 ++-- rust/operator-binary/src/crd/affinity.rs | 2 +- rust/operator-binary/src/crd/mod.rs | 16 ++++++++-------- tests/test-definition.yaml | 5 +++-- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/docs/modules/hdfs/examples/getting_started/hdfs.yaml b/docs/modules/hdfs/examples/getting_started/hdfs.yaml index ae7da1a9..c0ec1c74 100644 --- a/docs/modules/hdfs/examples/getting_started/hdfs.yaml +++ b/docs/modules/hdfs/examples/getting_started/hdfs.yaml @@ -5,7 +5,7 @@ metadata: name: simple-hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: simple-hdfs-znode dfsReplication: 1 diff --git a/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 b/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 index ae7da1a9..c0ec1c74 100644 --- a/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 +++ b/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 @@ -5,7 +5,7 @@ metadata: name: simple-hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: simple-hdfs-znode dfsReplication: 1 diff --git a/docs/modules/hdfs/pages/usage-guide/upgrading.adoc b/docs/modules/hdfs/pages/usage-guide/upgrading.adoc index 0a369fd5..981d9783 100644 --- a/docs/modules/hdfs/pages/usage-guide/upgrading.adoc +++ b/docs/modules/hdfs/pages/usage-guide/upgrading.adoc @@ -4,12 +4,12 @@ IMPORTANT: HDFS upgrades are experimental, and details may change at any time. HDFS currently requires a manual process to upgrade. -This guide takes you through an example case, upgrading an example cluster (from our xref:getting_started/index.adoc[Getting Started] guide) from HDFS 3.3.6 to 3.4.0. +This guide takes you through an example case, upgrading an example cluster (from our xref:getting_started/index.adoc[Getting Started] guide) from HDFS 3.3.6 to 3.4.1. == Preparing for the worst Upgrades can fail, and it is important to prepare for when that happens. -Apache HDFS supports https://hadoop.apache.org/docs/r3.4.0/hadoop-project-dist/hadoop-hdfs/HdfsRollingUpgrade.html#Downgrade_and_Rollback[two ways to revert an upgrade]: +Apache HDFS supports https://hadoop.apache.org/docs/r3.4.1/hadoop-project-dist/hadoop-hdfs/HdfsRollingUpgrade.html#Downgrade_and_Rollback[two ways to revert an upgrade]: Rollback:: Reverts all user data to the pre-upgrade state. Requires taking the cluster offline. Downgrade:: Downgrades the HDFS software but preserves all changes made by users. Can be performed as a rolling change, keeping the cluster online. @@ -69,7 +69,7 @@ Once HDFS is ready to upgrade, the HdfsCluster can be updated with the new produ [source,shell] ---- -$ kubectl patch hdfs/simple-hdfs --patch '{"spec": {"image": {"productVersion": "3.4.0"}}}' --type=merge +$ kubectl patch hdfs/simple-hdfs --patch '{"spec": {"image": {"productVersion": "3.4.1"}}}' --type=merge hdfscluster.hdfs.stackable.tech/simple-hdfs patched ---- @@ -103,7 +103,7 @@ Finally, mark the cluster as upgraded: [source,shell] ---- -$ kubectl patch hdfs/simple-hdfs --subresource=status --patch '{"status": {"deployedProductVersion": "3.4.0"}}' --type=merge +$ kubectl patch hdfs/simple-hdfs --subresource=status --patch '{"status": {"deployedProductVersion": "3.4.1"}}' --type=merge hdfscluster.hdfs.stackable.tech/simple-hdfs patched ---- diff --git a/docs/modules/hdfs/partials/supported-versions.adoc b/docs/modules/hdfs/partials/supported-versions.adoc index e0a88fa3..742cc3a0 100644 --- a/docs/modules/hdfs/partials/supported-versions.adoc +++ b/docs/modules/hdfs/partials/supported-versions.adoc @@ -2,6 +2,7 @@ // This is a separate file, since it is used by both the direct HDFS-Operator documentation, and the overarching // Stackable Platform documentation. -- 3.4.0 (LTS) +- 3.4.1 (LTS) +- 3.4.0 (deprecated) - 3.3.6 - Please note that there is a https://github.com/stackabletech/hdfs-operator/issues/440[known issue] related to NameNode bootstrapping which can happen in rare cases. - 3.3.4 diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs index e66206ae..16c92fc4 100644 --- a/rust/operator-binary/src/config/jvm.rs +++ b/rust/operator-binary/src/config/jvm.rs @@ -121,7 +121,7 @@ mod tests { name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk nameNodes: @@ -149,7 +149,7 @@ mod tests { name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk nameNodes: diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs index 917a1482..05f86f9f 100644 --- a/rust/operator-binary/src/crd/affinity.rs +++ b/rust/operator-binary/src/crd/affinity.rs @@ -55,7 +55,7 @@ metadata: name: simple-hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk journalNodes: diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index d721fa62..3783a662 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -1508,7 +1508,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1543,7 +1543,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1578,7 +1578,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1608,7 +1608,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk rackAwareness: @@ -1673,7 +1673,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1729,7 +1729,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1785,7 +1785,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1812,7 +1812,7 @@ metadata: name: hdfs spec: image: - productVersion: 3.4.0 + productVersion: 3.4.1 clusterConfig: zookeeperConfigMapName: hdfs-zk rackAwareness: diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 99f0212a..b0a6100a 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -5,11 +5,12 @@ dimensions: - 3.3.4 - 3.3.6 - 3.4.0 + - 3.4.1 # To use a custom image, add a comma and the full name after the product version # - 3.4.0,oci.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev - name: hadoop-latest values: - - 3.4.0 + - 3.4.1 # To use a custom image, add a comma and the full name after the product version # - 3.4.0,oci.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev - name: hadoop-external-client-docker-image @@ -20,7 +21,7 @@ dimensions: - 3.9.2 - name: zookeeper-latest values: - - 3.9.2 + - 3.9.3 - name: krb5 values: - 1.21.1 From 780df0aa0e6de55eb7cad3f124e138ea87c48d9a Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Wed, 12 Mar 2025 12:15:12 +0100 Subject: [PATCH 2/6] adapt changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed7e62ca..576ad9f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. - Run a `containerdebug` process in the background of each HDFS container to collect debugging information ([#629]). - Support configuring JVM arguments ([#636]). - Aggregate emitted Kubernetes events on the CustomResources ([#643]). +- Add support for version `3.4.1` ([#656]). ### Changed @@ -27,6 +28,7 @@ All notable changes to this project will be documented in this file. [#640]: https://github.com/stackabletech/hdfs-operator/pull/640 [#643]: https://github.com/stackabletech/hdfs-operator/pull/643 [#655]: https://github.com/stackabletech/hdfs-operator/pull/655 +[#656]: https://github.com/stackabletech/hdfs-operator/pull/656 ## [24.11.1] - 2025-01-10 From 3fed11693f7c56f5f7be1e9c7b03a30cf9194c55 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Wed, 12 Mar 2025 15:31:07 +0100 Subject: [PATCH 3/6] revert test zk version changes --- tests/test-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index b0a6100a..05dfa6b4 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -21,7 +21,7 @@ dimensions: - 3.9.2 - name: zookeeper-latest values: - - 3.9.3 + - 3.9.2 - name: krb5 values: - 1.21.1 From 3b9cab28881b5089a9bf367cbb939b73693da068 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Wed, 12 Mar 2025 15:47:22 +0100 Subject: [PATCH 4/6] Update CHANGELOG.md Co-authored-by: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 576ad9f3..48dd563d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file. - Run a `containerdebug` process in the background of each HDFS container to collect debugging information ([#629]). - Support configuring JVM arguments ([#636]). - Aggregate emitted Kubernetes events on the CustomResources ([#643]). -- Add support for version `3.4.1` ([#656]). +- Add support for version `3.4.1` ([#656]). ### Changed From eba40eb1e8ecba90676870823a6bc3a8d1031f65 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 13 Mar 2025 11:50:53 +0100 Subject: [PATCH 5/6] update custom images --- tests/test-definition.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 05dfa6b4..826f1c22 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -7,12 +7,12 @@ dimensions: - 3.4.0 - 3.4.1 # To use a custom image, add a comma and the full name after the product version - # - 3.4.0,oci.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev + # - 3.4.1,oci.stackable.tech/sandbox/hadoop:3.4.1-stackable0.0.0-dev - name: hadoop-latest values: - 3.4.1 # To use a custom image, add a comma and the full name after the product version - # - 3.4.0,oci.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev + # - 3.4.1,oci.stackable.tech/sandbox/hadoop:3.4.1-stackable0.0.0-dev - name: hadoop-external-client-docker-image values: - 3.3.6 From 80d845ca03afa4cdcf04339711127b445833cce0 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Thu, 13 Mar 2025 11:51:44 +0100 Subject: [PATCH 6/6] mark 3.3.4/6 deprecated --- docs/modules/hdfs/partials/supported-versions.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/hdfs/partials/supported-versions.adoc b/docs/modules/hdfs/partials/supported-versions.adoc index 742cc3a0..66cedbef 100644 --- a/docs/modules/hdfs/partials/supported-versions.adoc +++ b/docs/modules/hdfs/partials/supported-versions.adoc @@ -4,5 +4,5 @@ - 3.4.1 (LTS) - 3.4.0 (deprecated) -- 3.3.6 - Please note that there is a https://github.com/stackabletech/hdfs-operator/issues/440[known issue] related to NameNode bootstrapping which can happen in rare cases. -- 3.3.4 +- 3.3.6 (deprecated) - Please note that there is a https://github.com/stackabletech/hdfs-operator/issues/440[known issue] related to NameNode bootstrapping which can happen in rare cases. +- 3.3.4 (deprecated)