From 4d0bc156cbc5262148af5d66afced92966b5faf4 Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Tue, 11 Oct 2022 10:57:42 +0200
Subject: [PATCH 1/2] Adapted versions to 1.18.0

---
 CHANGELOG.md                                               | 2 ++
 docs/modules/ROOT/partials/supported-versions.adoc         | 7 +++++++
 .../getting_started/examples/code/getting-started.sh       | 4 ++--
 .../getting_started/examples/code/getting-started.sh.j2    | 4 ++--
 examples/simple-nifi-cluster.yaml                          | 2 +-
 tests/test-definition.yaml                                 | 3 ++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5871443..7df6fead 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,11 @@ All notable changes to this project will be documented in this file.
 
 - Support for in-place Nifi cluster upgrades ([#323])
 - Added default resource requests (memory and cpu) for Nifi pods ([#353])
+- Added support for NiFi version 1.18.0 ([#xxx])
 
 [#323]: https://github.com/stackabletech/nifi-operator/pull/323
 [#353]: https://github.com/stackabletech/nifi-operator/pull/353
+[#xxx]: https://github.com/stackabletech/nifi-operator/pull/xxx
 
 ## [0.7.0] - 2022-09-06
 
diff --git a/docs/modules/ROOT/partials/supported-versions.adoc b/docs/modules/ROOT/partials/supported-versions.adoc
index c0013af0..f9fec206 100644
--- a/docs/modules/ROOT/partials/supported-versions.adoc
+++ b/docs/modules/ROOT/partials/supported-versions.adoc
@@ -3,4 +3,11 @@
 // Stackable Platform documentation.
 
 - 1.15.0
+- 1.15.1
+- 1.15.2
+- 1.15.3
+- 1.16.0
+- 1.16.1
+- 1.16.2
 - 1.16.3
+- 1.18.0
diff --git a/docs/modules/getting_started/examples/code/getting-started.sh b/docs/modules/getting_started/examples/code/getting-started.sh
index 9a87f2bd..f935b4c9 100755
--- a/docs/modules/getting_started/examples/code/getting-started.sh
+++ b/docs/modules/getting_started/examples/code/getting-started.sh
@@ -64,7 +64,7 @@ spec:
 EOF
 # end::install-zookeeper[]
 
-echo "Crate a ZNode"
+echo "Create a ZNode"
 # tag::install-znode[]
 kubectl apply -f - <<EOF
 ---
@@ -108,7 +108,7 @@ kind: NifiCluster
 metadata:
   name: simple-nifi
 spec:
-  version: 1.16.3-stackable0.1.0
+  version: 1.18.0-stackable0.1.0
   zookeeperConfigMapName: simple-nifi-znode
   config:
     authentication:
diff --git a/docs/modules/getting_started/examples/code/getting-started.sh.j2 b/docs/modules/getting_started/examples/code/getting-started.sh.j2
index 153609f3..9e144f28 100755
--- a/docs/modules/getting_started/examples/code/getting-started.sh.j2
+++ b/docs/modules/getting_started/examples/code/getting-started.sh.j2
@@ -64,7 +64,7 @@ spec:
 EOF
 # end::install-zookeeper[]
 
-echo "Crate a ZNode"
+echo "Create a ZNode"
 # tag::install-znode[]
 kubectl apply -f - <<EOF
 ---
@@ -108,7 +108,7 @@ kind: NifiCluster
 metadata:
   name: simple-nifi
 spec:
-  version: 1.16.3-stackable0.1.0
+  version: 1.18.0-stackable0.1.0
   zookeeperConfigMapName: simple-nifi-znode
   config:
     authentication:
diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml
index b85c0aa0..ced299cf 100644
--- a/examples/simple-nifi-cluster.yaml
+++ b/examples/simple-nifi-cluster.yaml
@@ -37,7 +37,7 @@ kind: NifiCluster
 metadata:
   name: simple-nifi
 spec:
-  version: 1.15.0-stackable0.1.0
+  version: 1.18.0-stackable0.1.0
   zookeeperConfigMapName: simple-nifi-znode
   config:
     authentication:
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index ec7e42c9..0f5ed00c 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -10,13 +10,14 @@ dimensions:
     values:
       - 1.15.0-stackable0.4.0
       - 1.16.3-stackable0.1.0
+      - 1.18.0-stackable0.1.0
   - name: nifi_old
     values:
       - 1.15.0-stackable0.4.0
       - 1.16.0-stackable0.1.0
   - name: nifi_new
     values:
-      - 1.16.3-stackable0.1.0
+      - 1.18.0-stackable0.1.0
   - name: ldap-use-tls
     values:
       - "false"

From a448b039ba10ede6de259f7647d1e8885b98058d Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Tue, 11 Oct 2022 11:02:36 +0200
Subject: [PATCH 2/2] adapted changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7df6fead..0308304b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,11 @@ All notable changes to this project will be documented in this file.
 
 - Support for in-place Nifi cluster upgrades ([#323])
 - Added default resource requests (memory and cpu) for Nifi pods ([#353])
-- Added support for NiFi version 1.18.0 ([#xxx])
+- Added support for NiFi version 1.18.0 ([#360])
 
 [#323]: https://github.com/stackabletech/nifi-operator/pull/323
 [#353]: https://github.com/stackabletech/nifi-operator/pull/353
-[#xxx]: https://github.com/stackabletech/nifi-operator/pull/xxx
+[#360]: https://github.com/stackabletech/nifi-operator/pull/360
 
 ## [0.7.0] - 2022-09-06