From 5d4f7f9d2ef07f3dbe2b3d2f40017da333f4d069 Mon Sep 17 00:00:00 2001
From: Guillaume Moutier <guimou@users.noreply.github.com>
Date: Tue, 25 Oct 2022 21:59:04 +0200
Subject: [PATCH] fix extensions folder + fix cpu/memory requests (#13)

---
 deployment/base/deployment-nifi-ca.yaml |  5 ++++-
 deployment/base/ss-nifi.yaml            | 13 ++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/deployment/base/deployment-nifi-ca.yaml b/deployment/base/deployment-nifi-ca.yaml
index 0a66855..62a3f53 100644
--- a/deployment/base/deployment-nifi-ca.yaml
+++ b/deployment/base/deployment-nifi-ca.yaml
@@ -31,7 +31,10 @@ spec:
           resources:
             requests:
               cpu: "0.1"
-              memory: 250Mi
+              memory: 512Mi
+            limits:
+              cpu: "0.25"
+              memory: 512Mi
           ports:
             - containerPort: 9090
           livenessProbe:
diff --git a/deployment/base/ss-nifi.yaml b/deployment/base/ss-nifi.yaml
index 5371b40..f74906c 100644
--- a/deployment/base/ss-nifi.yaml
+++ b/deployment/base/ss-nifi.yaml
@@ -59,6 +59,13 @@ spec:
         - name: cert-request
           imagePullPolicy: "IfNotPresent"
           image: nifi-toolkit
+          resources:
+            requests:
+              cpu: 1
+              memory: 512Mi
+            limits:
+              cpu: 1
+              memory: 512Mi
           command:
             - bash
             - -c
@@ -300,8 +307,8 @@ spec:
               wait ${nifi_pid}
 
               /opt/nifi/nifi-toolkit-current/bin/tls-toolkit.sh standalone \
-                -n '$FQDN' \
-                -C '$(admin_identity)' \
+                -n '$(hostname -f)' \
+                -C '$(admin_identity),OU=NIFI' \
                 -o '/opt/nifi/nifi-current/conf/' \
                 -P env:PASS  \
                 -S env:PASS  \
@@ -357,7 +364,7 @@ spec:
             - name: "logs"
               mountPath: /opt/nifi/nifi-current/logs
             - name: "extensions"
-              mountPath: /opt/nifi/nifi-current/extension              
+              mountPath: /opt/nifi/nifi-current/extensions              
             - name: "bootstrap-conf"
               mountPath: /opt/nifi/nifi-current/conf/bootstrap.conf
               subPath: "bootstrap.conf"