Skip to content

Commit 214733c

Browse files
committed
Updated code to adhere to ADR018 (#180)
## Description This contains a breaking change, since the version that is specified for HDFS now has to include a stackable image version. Previously the version could be specified as "version: 3.2.1" and the operator simply added the stackable version to this. But going forward we have decided that the image version has to be explictly specified, so it will now have to be "version: 3.2.1-stackable-0.1.0" or similar. This is in accordance with ADR18 (https://docs.stackable.tech/home/contributor/adr/ADR018-product_image_versioning.html). *Please add a description here. This will become the commit message of the merge request later.*
1 parent 78e9320 commit 214733c

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ All notable changes to this project will be documented in this file.
2020

2121
- `operator-rs` `0.10.0` -> `0.15.0` ([#130], [#134], [#148]).
2222
- `HADOOP_OPTS` for jmx exporter specified to `HADOOP_NAMENODE_OPTS`, `HADOOP_DATANODE_OPTS` and `HADOOP_JOURNALNODE_OPTS` to fix cli tool ([#148]).
23+
- [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])
24+
2325

2426
[#122]: https://github.com/stackabletech/hdfs-operator/pull/122
2527
[#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.
2830
[#150]: https://github.com/stackabletech/hdfs-operator/pull/150
2931
[#162]: https://github.com/stackabletech/hdfs-operator/pull/162
3032
[#164]: https://github.com/stackabletech/hdfs-operator/pull/164
33+
[#180]: https://github.com/stackabletech/hdfs-operator/pull/180
3134

3235
## [0.3.0] - 2022-02-14
3336

docs/modules/ROOT/pages/usage.adoc

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kind: ZookeeperCluster
1313
metadata:
1414
name: simple-zk
1515
spec:
16-
version: 3.5.8
16+
version: 3.5.8-stackable0.7.0
1717
servers:
1818
roleGroups:
1919
default:
@@ -31,7 +31,11 @@ spec:
3131
EOF
3232
----
3333

34-
Once a Zookeeper cluster and the operator are up and running, you can create an Apache HDFS (v3.2.2) cluster like this:
34+
Once a Zookeeper cluster and the operator are up and running, you can create an Apache HDFS cluster like shown below.
35+
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.
36+
This Stackable version is the version of the underlying container image which is used to execute the processes.
37+
For a list of available versions please check our https://repo.stackable.tech/#browse/browse:docker:v2%2Fstackable%2Fhadoop%2Ftags[image registry].
38+
It should generally be safe to simply use the latest image version that is available.
3539

3640
[source,bash]
3741
----
@@ -41,7 +45,7 @@ kind: HdfsCluster
4145
metadata:
4246
name: simple
4347
spec:
44-
version: 3.2.2
48+
version: 3.2.2-stackable0.5.0
4549
zookeeperConfigMapName: simple-znode
4650
dfsReplication: 3
4751
log4j: |-

examples/simple-hdfs-cluster.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: ZookeeperCluster
44
metadata:
55
name: simple-zk
66
spec:
7-
version: 3.5.8
7+
version: 3.5.8-stackable0.7.0
88
servers:
99
roleGroups:
1010
default:
@@ -27,7 +27,7 @@ kind: HdfsCluster
2727
metadata:
2828
name: simple-hdfs
2929
spec:
30-
version: 3.2.2
30+
version: 3.2.2-stackable0.5.0
3131
zookeeperConfigMapName: simple-hdfs-znode
3232
dfsReplication: 3
3333
log4j: |-

rust/crd/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl HdfsCluster {
166166

167167
pub fn hdfs_image(&self) -> HdfsOperatorResult<String> {
168168
Ok(format!(
169-
"docker.stackable.tech/stackable/hadoop:{}-stackable0",
169+
"docker.stackable.tech/stackable/hadoop:{}",
170170
self.hdfs_version()?
171171
))
172172
}

tests/test-definition.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
dimensions:
33
- name: hadoop
44
values:
5-
- 3.2.2
5+
- 3.2.2-stackable0.5.0
66
- name: zookeeper
77
values:
8-
- 3.5.8
8+
- 3.5.8-stackable0.7.0
99
tests:
1010
- name: fs-ops
1111
dimensions:

0 commit comments

Comments
 (0)