Merge remote-tracking branch 'origin/main' into feat/graceful-shutdown-2

Author: sbernauer

CHANGELOG.md

@@ -10,17 +10,22 @@ All notable changes to this project will be documented in this file.
 - Configuration overrides for the JVM security properties, such as DNS caching ([#384]).
 - Support PodDisruptionBudgets ([#394]).
 - Support graceful shutdown ([#407]).
+- Added support for 3.2.4, 3.3.6 ([#409]).
 
 ### Changed
 
-- `vector` `0.26.0` -> `0.31.0` ([#378]).
+- `vector` `0.26.0` -> `0.33.0` ([#378], [#409]).
 - Let secret-operator handle certificate conversion ([#392]).
-- `operator-rs` `0.44.0` -> `0.52.1` ([#381], [#394], [#404], [#405]).
+- `operator-rs` `0.44.0` -> `0.55.0` ([#381], [#394], [#404], [#405], [#409]).
 
 ### Fixed
 
 - Don't default roleGroup replicas to zero when not specified ([#402]).
 
+### Removed
+
+- Removed support for 3.3.1, 3.3.3 ([#409]).
+
 [#378]: https://github.com/stackabletech/hdfs-operator/pull/378
 [#381]: https://github.com/stackabletech/hdfs-operator/pull/381
 [#384]: https://github.com/stackabletech/hdfs-operator/pull/384
@@ -30,6 +35,7 @@ All notable changes to this project will be documented in this file.
 [#404]: https://github.com/stackabletech/hdfs-operator/pull/404
 [#405]: https://github.com/stackabletech/hdfs-operator/pull/405
 [#407]: https://github.com/stackabletech/hdfs-operator/pull/407
+[#409]: https://github.com/stackabletech/hdfs-operator/pull/409
 
 ## [23.7.0] - 2023-07-14
 

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

@@ -5,7 +5,7 @@ metadata:
   name: simple-hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: simple-hdfs-znode
     listenerClass: external-unstable

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

@@ -5,7 +5,7 @@ metadata:
   name: simple-hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: simple-hdfs-znode
     listenerClass: external-unstable

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

@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.3
   servers:
     roleGroups:
       default:

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

@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.3
   servers:
     roleGroups:
       default:

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

@@ -2,7 +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.2.2
-- 3.3.1
-- 3.3.3
-- 3.3.4
+- 3.3.6
+- 3.3.4 (deprecated)
+- 3.2.4
+- 3.2.2 (deprecated)

rust/crd/src/affinity.rs

@@ -55,7 +55,7 @@ metadata:
   name: simple-hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   journalNodes:
@@ -142,7 +142,7 @@ metadata:
   name: simple-hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   journalNodes:

rust/crd/src/lib.rs

@@ -1300,7 +1300,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   dataNodes:
@@ -1338,7 +1338,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   dataNodes:
@@ -1376,7 +1376,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   dataNodes:
@@ -1409,7 +1409,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   nameNodes:
@@ -1473,7 +1473,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   dataNodes:
@@ -1527,7 +1527,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   dataNodes:
@@ -1581,7 +1581,7 @@ metadata:
   name: hdfs
 spec:
   image:
-    productVersion: 3.3.4
+    productVersion: 3.3.6
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
   dataNodes:

rust/operator/src/container.rs

@@ -910,17 +910,9 @@ impl ContainerConfig {
             } => {
                 let cvd = ContainerVolumeDirs::from(role);
                 let config_dir = cvd.final_config();
-                // This currently points at 0.16.1 for historic reasons.
-                // We used to (and actually still do) hardcode the version number of JMX Exporter
-                // Newer Docker Images (anything after 23.7) do upgrade the version however and they do
-                // expose the JMX Exporter using a symlink under the name jmx_prometheus_javaagent.jar
-                // But to make sure that newer operators work with older images we keep this reference to 0.16.1 in here for now
-                // To still get a new version of JMX exporter we actually symlink the newer version to this older one
-                // In other words: The actual version of JMX Exporter might _not_ be 0.16.1 anymore
-                // We can fix this properly by pointing at the versionless JAR in one of our upcoming releases (e.g. 24.x)
                 let mut jvm_args = vec![
                     format!(
-                        "-Djava.security.properties={config_dir}/{JVM_SECURITY_PROPERTIES_FILE} -javaagent:/stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar={metrics_port}:/stackable/jmx/{role}.yaml",
+                        "-Djava.security.properties={config_dir}/{JVM_SECURITY_PROPERTIES_FILE} -javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={metrics_port}:/stackable/jmx/{role}.yaml",
                     )];
 
                 if hdfs.has_kerberos_enabled() {

tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2

@@ -14,7 +14,7 @@ commands:
           spec:
             containers:
               - name: access-hdfs
-                image: docker.stackable.tech/stackable/hadoop:3.3.4-stackable0.0.0-dev
+                image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
                 env:
                   - name: HADOOP_CONF_DIR
                     value: /stackable/conf/hdfs

tests/templates/kuttl/kerberos/22-check-file.yaml.j2

@@ -14,7 +14,7 @@ commands:
           spec:
             containers:
               - name: check-hdfs
-                image: docker.stackable.tech/stackable/hadoop:3.3.4-stackable0.0.0-dev
+                image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
                 env:
                   - name: HADOOP_CONF_DIR
                     value: /stackable/conf/hdfs

tests/templates/kuttl/logging/01-install-hdfs-vector-aggregator.yaml

@@ -5,7 +5,7 @@ commands:
   - script: >-
       helm install hdfs-vector-aggregator vector
       --namespace $NAMESPACE
-      --version 0.23.0
+      --version 0.26.0
       --repo https://helm.vector.dev
       --values hdfs-vector-aggregator-values.yaml
 ---

tests/test-definition.yaml

@@ -2,17 +2,17 @@
 dimensions:
   - name: hadoop
     values:
-      - 3.2.2
-      - 3.3.4
+      - 3.2.4
+      - 3.3.6
   - name: hadoop-latest
     values:
-      - 3.3.4
+      - 3.3.6
   - name: zookeeper
     values:
-      - 3.8.0
+      - 3.8.3
   - name: zookeeper-latest
     values:
-      - 3.8.0
+      - 3.8.3
   - name: number-of-datanodes
     values:
       - "1"