[Merged by Bors] - Updated code to adhere to ADR018

CHANGELOG.md

@@ -20,6 +20,8 @@ All notable changes to this project will be documented in this file.
 
 - `operator-rs` `0.10.0` -> `0.15.0` ([#130], [#134], [#148]).
 - `HADOOP_OPTS` for jmx exporter specified to `HADOOP_NAMENODE_OPTS`, `HADOOP_DATANODE_OPTS` and `HADOOP_JOURNALNODE_OPTS` to fix cli tool ([#148]).
+- [BREAKING] Specifying the product version has been changed to adhere to [ADR018](https://docs.stackable.tech/home/contributor/adr/ADR018-product_image_versioning.html) instead of just specifying the product version you will now have to add the Stackable image version as well, so `version: 3.5.8` becomes (for example) `version: 3.5.8-stackable0.1.0` ([#180])
+
 
 [#122]: https://github.com/stackabletech/hdfs-operator/pull/122
 [#130]: https://github.com/stackabletech/hdfs-operator/pull/130
@@ -28,6 +30,7 @@ All notable changes to this project will be documented in this file.
 [#150]: https://github.com/stackabletech/hdfs-operator/pull/150
 [#162]: https://github.com/stackabletech/hdfs-operator/pull/162
 [#164]: https://github.com/stackabletech/hdfs-operator/pull/164
+[#180]: https://github.com/stackabletech/hdfs-operator/pull/180
 
 ## [0.3.0] - 2022-02-14
 

docs/modules/ROOT/pages/usage.adoc

@@ -13,7 +13,7 @@ kind: ZookeeperCluster
 metadata:
  name: simple-zk
 spec:
- version: 3.5.8
+ version: 3.5.8-stackable0.7.0
  servers:
  roleGroups:
  default:
@@ -31,7 +31,11 @@ spec:
 EOF
 ----
 
-Once a Zookeeper cluster and the operator are up and running, you can create an Apache HDFS (v3.2.2) cluster like this:
+Once a Zookeeper cluster and the operator are up and running, you can create an Apache HDFS cluster like shown below.
+Please note that the version you need to specify is not only the version of Hadoop which you want to roll out, but has to be amended with a Stackable version as shown.
+This Stackable version is the version of the underlying container image which is used to execute the processes.
+For a list of available versions please check our https://repo.stackable.tech/#browse/browse:docker:v2%2Fstackable%2Fhadoop%2Ftags[image registry].
+It should generally be safe to simply use the latest image version that is available.
 
 [source,bash]
 ----
@@ -41,7 +45,7 @@ kind: HdfsCluster
 metadata:
  name: simple
 spec:
- version: 3.2.2
+ version: 3.2.2-stackable0.5.0
  zookeeperConfigMapName: simple-znode
  dfsReplication: 3
  log4j: |-

examples/simple-hdfs-cluster.yaml

@@ -4,7 +4,7 @@ kind: ZookeeperCluster
 metadata:
  name: simple-zk
 spec:
- version: 3.5.8
+ version: 3.5.8-stackable0.7.0
  servers:
  roleGroups:
  default:
@@ -27,7 +27,7 @@ kind: HdfsCluster
 metadata:
  name: simple-hdfs
 spec:
- version: 3.2.2
+ version: 3.2.2-stackable0.5.0
  zookeeperConfigMapName: simple-hdfs-znode
  dfsReplication: 3
  log4j: |-

rust/crd/src/lib.rs

@@ -166,7 +166,7 @@ impl HdfsCluster {
 
  pub fn hdfs_image(&self) -> HdfsOperatorResult<String> {
  Ok(format!(
- "docker.stackable.tech/stackable/hadoop:{}-stackable0",
+ "docker.stackable.tech/stackable/hadoop:{}",
  self.hdfs_version()?
  ))
  }

tests/test-definition.yaml

@@ -2,10 +2,10 @@
 dimensions:
  - name: hadoop
  values:
- - 3.2.2
+ - 3.2.2-stackable0.5.0
  - name: zookeeper
  values:
- - 3.5.8
+ - 3.5.8-stackable0.7.0
 tests:
  - name: fs-ops
  dimensions: