From 907ff69bfd97780f49a71cacea21cfca50c355c5 Mon Sep 17 00:00:00 2001
From: Guillaume Moutier <guillaume.moutier@gmail.com>
Date: Thu, 26 May 2022 11:57:59 -0400
Subject: [PATCH] update to 1.16.2

---
 containers/nifi-registry/DockerImage.txt | 2 +-
 containers/nifi-registry/Dockerfile      | 2 +-
 containers/nifi-registry/build.notes     | 2 +-
 containers/nifi-toolkit/Dockerfile       | 2 +-
 containers/nifi-toolkit/build.notes      | 2 +-
 containers/nifi/DockerImage.txt          | 2 +-
 containers/nifi/Dockerfile               | 2 +-
 containers/nifi/build.notes              | 3 ++-
 containers/nifi/pom.xml                  | 2 +-
 deployment/base/kustomization.yaml       | 6 +++---
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/containers/nifi-registry/DockerImage.txt b/containers/nifi-registry/DockerImage.txt
index 4270ded..96bbe84 100644
--- a/containers/nifi-registry/DockerImage.txt
+++ b/containers/nifi-registry/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi-registry:1.16.1
+apache/nifi-registry:1.16.2
diff --git a/containers/nifi-registry/Dockerfile b/containers/nifi-registry/Dockerfile
index ad26f4d..00880e6 100644
--- a/containers/nifi-registry/Dockerfile
+++ b/containers/nifi-registry/Dockerfile
@@ -22,7 +22,7 @@ LABEL site="https://nifi.apache.org"
 
 ARG UID=1001
 ARG GID=0
-ARG NIFI_REGISTRY_VERSION=1.16.1
+ARG NIFI_REGISTRY_VERSION=1.16.2
 ARG MIRROR=https://archive.apache.org/dist
 
 ENV NIFI_REGISTRY_BASE_DIR /opt/nifi-registry
diff --git a/containers/nifi-registry/build.notes b/containers/nifi-registry/build.notes
index aab7c85..fb231aa 100644
--- a/containers/nifi-registry/build.notes
+++ b/containers/nifi-registry/build.notes
@@ -1 +1 @@
-docker build --build-arg MIRROR=https://dlcdn.apache.org --build-arg NIFI_REGISTRY_BINARY_URL=nifi/1.16.1/nifi-registry-1.16.1-bin.tar.gz -t nifi-registry:1.16.1 .
\ No newline at end of file
+docker build --build-arg MIRROR=https://dlcdn.apache.org --build-arg NIFI_REGISTRY_BINARY_URL=nifi/1.16.2/nifi-registry-1.16.2-bin.tar.gz -t nifi-registry:1.16.2 .
\ No newline at end of file
diff --git a/containers/nifi-toolkit/Dockerfile b/containers/nifi-toolkit/Dockerfile
index e6031c1..ac4e73b 100644
--- a/containers/nifi-toolkit/Dockerfile
+++ b/containers/nifi-toolkit/Dockerfile
@@ -21,7 +21,7 @@ LABEL maintainer "Apache NiFi <dev@nifi.apache.org>"
 
 ARG UID=1001
 ARG GID=0
-ARG NIFI_TOOLKIT_VERSION=1.16.1
+ARG NIFI_TOOLKIT_VERSION=1.16.2
 ARG MIRROR=https://archive.apache.org/dist
 
 ENV NIFI_TOOLKIT_BASE_DIR=/opt/nifi-toolkit
diff --git a/containers/nifi-toolkit/build.notes b/containers/nifi-toolkit/build.notes
index 21b354a..39ecfc8 100644
--- a/containers/nifi-toolkit/build.notes
+++ b/containers/nifi-toolkit/build.notes
@@ -1 +1 @@
-docker build --build-arg MIRROR=https://dlcdn.apache.org/ -t nifi-toolkit:1.16.1 .
\ No newline at end of file
+docker build --build-arg MIRROR=https://dlcdn.apache.org/ -t nifi-toolkit:1.16.2 .
\ No newline at end of file
diff --git a/containers/nifi/DockerImage.txt b/containers/nifi/DockerImage.txt
index 898fa98..1130156 100644
--- a/containers/nifi/DockerImage.txt
+++ b/containers/nifi/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nifi:1.16.1
+nifi:1.16.2
diff --git a/containers/nifi/Dockerfile b/containers/nifi/Dockerfile
index b2184fa..57c3e96 100644
--- a/containers/nifi/Dockerfile
+++ b/containers/nifi/Dockerfile
@@ -24,7 +24,7 @@ LABEL site="https://nifi.apache.org"
 
 ARG UID=1001
 ARG GID=0
-ARG NIFI_VERSION=1.16.1
+ARG NIFI_VERSION=1.16.2
 ARG BASE_URL=https://archive.apache.org/dist
 ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}}
 ARG DISTRO_PATH=${DISTRO_PATH:-${NIFI_VERSION}}
diff --git a/containers/nifi/build.notes b/containers/nifi/build.notes
index 1d96f77..e1618b1 100644
--- a/containers/nifi/build.notes
+++ b/containers/nifi/build.notes
@@ -1 +1,2 @@
-./DockerBuild.sh 1001 0 https://dlcdn.apache.org/ https://dlcdn.apache.org/ 1.16.1
\ No newline at end of file
+Command to build from a mirror repo:
+./DockerBuild.sh 1001 0 https://dlcdn.apache.org/ https://dlcdn.apache.org/ 1.16.2
\ No newline at end of file
diff --git a/containers/nifi/pom.xml b/containers/nifi/pom.xml
index eeb1bb8..ee437f2 100644
--- a/containers/nifi/pom.xml
+++ b/containers/nifi/pom.xml
@@ -26,7 +26,7 @@
         <docker.maintainer><![CDATA[Apache NiFi <dev@nifi.apache.org>]]></docker.maintainer>
         <!-- files need to exist at https://archive.apache.org/dist/nifi/${docker.nifi.version}/nifi-[toolkit-]${docker.nifi.version}-bin.zip
             so this version needs to be *before* the current ${project.version} -->
-        <docker.nifi.version>1.16.1</docker.nifi.version>
+        <docker.nifi.version>1.16.2</docker.nifi.version>
     </properties>
 
     <profiles>
diff --git a/deployment/base/kustomization.yaml b/deployment/base/kustomization.yaml
index 9efbd41..c4cf860 100644
--- a/deployment/base/kustomization.yaml
+++ b/deployment/base/kustomization.yaml
@@ -173,13 +173,13 @@ images:
     newTag: 3.16.0
   - name: nifi
     newName: quay.io/rh-data-services/nifi-openshift
-    newTag: 1.16.1
+    newTag: 1.16.2
   - name: nifi-registry
     newName: quay.io/rh-data-services/nifi-registry-openshift
-    newTag: 1.16.1
+    newTag: 1.16.2
   - name: nifi-toolkit
     newName: quay.io/rh-data-services/nifi-toolkit-openshift
-    newTag: 1.16.1
+    newTag: 1.16.2
   - name: zookeeper
     newName: bitnami/zookeeper
     newTag: 3.7.1