From 1642531123b5dfe08dfe818fe8b4927565c4d000 Mon Sep 17 00:00:00 2001
From: p2a <p2a@p2a-data.com>
Date: Thu, 12 May 2022 21:23:23 +0200
Subject: [PATCH 1/2] correcting simplenificluster.yaml

---
 config/samples/simplenificluster.yaml | 83 +++++++++++----------------
 1 file changed, 34 insertions(+), 49 deletions(-)

diff --git a/config/samples/simplenificluster.yaml b/config/samples/simplenificluster.yaml
index ad79446e29..6de1ffff03 100644
--- a/config/samples/simplenificluster.yaml
+++ b/config/samples/simplenificluster.yaml
@@ -5,13 +5,31 @@ metadata:
 spec:
   service:
     headlessEnabled: true
-  zkAddress: "zookeeper.zookeeeper:2181"
-  zkPath: "/simplenifi"
-  clusterImage: "apache/nifi:1.15.3"
-  oneNifiNodePerNode: false
+    labels:
+      cluster-name: simplenifi
+  zkAddress: "zookeeper.zookeeper:2181"
+  zkPath: /simplenifi
+  externalServices:
+    - metadata:
+        labels:
+          cluster-name: driver-simplenifi
+      name: driver-ip
+      spec:
+        portConfigs:
+          - internalListenerName: http
+            port: 8080
+        type: LoadBalancer
+  clusterImage: 'apache/nifi:1.12.1'
+  initContainerImage: 'busybox:1.34.0'
+  oneNifiNodePerNode: true
+  pod:
+    labels:
+      cluster-name: simplenifi
   nodeConfigGroups:
     default_group:
+      imagePullPolicy: IfNotPresent
       isNode: true
+      serviceAccountName: default
       storageConfigs:
         - mountPath: "/opt/nifi/nifi-current/logs"
           name: logs
@@ -22,7 +40,6 @@ spec:
             resources:
               requests:
                 storage: 10Gi
-      serviceAccountName: "default"
       resourcesRequirements:
         limits:
           cpu: "0.5"
@@ -40,47 +57,15 @@ spec:
     retryDurationMinutes: 10
   listenersConfig:
     internalListeners:
-      - type: "http"
-        name: "http"
-        containerPort: 8080
-      - type: "cluster"
-        name: "cluster"
-        containerPort: 6007
-      - type: "s2s"
-        name: "s2s"
-        containerPort: 10000
-      - type: "prometheus"
-        name: "prometheus"
-        containerPort: 9090
-  externalServices:
-    - name: "clusterip"
-      spec:
-        type: ClusterIP
-        portConfigs:
-          - port: 8080
-            internalListenerName: "http"
-      metadata:
-        annotations:
-          toto: tata
-    - name: "loadbalancer"
-      spec:
-        type: LoadBalancer
-        portConfigs:
-          - port: 8080
-            internalListenerName: "http"
-      metadata:
-        annotations:
-          toto: tata
-        labels:
-          titi: tutu
-    - name: "nodepart"
-      spec:
-        type: NodePort
-        portConfigs:
-          - port: 8080
-            internalListenerName: "http"
-      metadata:
-        annotations:
-          toto: tata
-        labels:
-          titi: tutu
+      - containerPort: 8080
+        type: http
+        name: http
+      - containerPort: 6007
+        type: cluster
+        name: cluster
+      - containerPort: 10000
+        type: s2s
+        name: s2s
+      - containerPort: 9090
+        type: prometheus
+        name: prometheus
\ No newline at end of file

From 1a379fdf42e22957188d23beac7bebff2708bedb Mon Sep 17 00:00:00 2001
From: Alexandre Guitton <10503351+erdrix@users.noreply.github.com>
Date: Wed, 15 Jun 2022 21:15:22 +0200
Subject: [PATCH 2/2] Update config/samples/simplenificluster.yaml

---
 config/samples/simplenificluster.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/samples/simplenificluster.yaml b/config/samples/simplenificluster.yaml
index 6de1ffff03..0216d7f5c7 100644
--- a/config/samples/simplenificluster.yaml
+++ b/config/samples/simplenificluster.yaml
@@ -19,7 +19,7 @@ spec:
           - internalListenerName: http
             port: 8080
         type: LoadBalancer
-  clusterImage: 'apache/nifi:1.12.1'
+  clusterImage: "apache/nifi:1.15.3"
   initContainerImage: 'busybox:1.34.0'
   oneNifiNodePerNode: true
   pod: