Merge branch 'develop'

cetic · Sep 30, 2020 · b8927f7 · b8927f7
2 parents 345c190 + 05aa176
commit b8927f7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,8 +1,8 @@
 ---
 apiVersion: v2
 name: nifi
-version: 0.5.3
-appVersion: 1.11.4
+version: 0.5.4
+appVersion: 1.12.1
 description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems.
 keywords:
   - nifi

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ The following table lists the configurable parameters of the nifi chart and the
 | `replicaCount`                                                              | Number of nifi nodes                                                                                               | `1`                             |
 | **Image**                                                                   |
 | `image.repository`                                                          | nifi Image name                                                                                                    | `apache/nifi`                   |
-| `image.tag`                                                                 | nifi Image tag                                                                                                     | `1.11.4`                        |
+| `image.tag`                                                                 | nifi Image tag                                                                                                     | `1.12.1`                        |
 | `image.pullPolicy`                                                          | nifi Image pull policy                                                                                             | `IfNotPresent`                  |
 | `image.pullSecret`                                                          | nifi Image pull secret                                                                                             | `nil`                           |
 | **SecurityContext**                                                         |
@@ -108,6 +108,7 @@ The following table lists the configurable parameters of the nifi chart and the
 | `properties.siteToSite.port`                                                | Site to Site properties Secure port                                                                                | `10000`                         |
 | `properties.siteToSite.authorizer`                                          |                                                                                                                    | `managed-authorizer`            |
 | `properties.safetyValve`                                                    | Map of explicit 'property: value' pairs that overwrite other configuration                                         | `nil`                           |
+| `properties.customLibPath`                                                  | Path of the custom libraries folder                                                                                | `nil`                           |
 | **nifi user authentication**                                                |
 | `auth.admin`                                                                | Default admin identity                                                                                             | ` CN=admin, OU=NIFI`            |
 | `auth.ldap.enabled`                                                         | Enable User auth via ldap                                                                                          | `false`                         |

diff --git a/configs/nifi.properties b/configs/nifi.properties
@@ -33,6 +33,7 @@ nifi.templates.directory=../data/templates
 nifi.ui.banner.text=
 nifi.ui.autorefresh.interval=30 sec
 nifi.nar.library.directory=./lib
+nifi.nar.library.directory.custom={{.Values.properties.customLibPath}}
 nifi.nar.working.directory=./work/nar/
 nifi.documentation.working.directory=./work/docs/components
 

diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
@@ -279,8 +279,7 @@ spec:
 {{- end }}
           name: https
           protocol: TCP
-{{- end }}
-{{- if .Values.properties.httpPort }}
+{{- else }}
         - containerPort: {{ .Values.properties.httpPort }}
           name: http
           protocol: TCP

diff --git a/values.yaml b/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 ##
 image:
   repository: apache/nifi
-  tag: "1.11.4"
+  tag: "1.12.1"
   pullPolicy: IfNotPresent
 
   ## Optionally specify an imagePullSecret.
@@ -68,6 +68,9 @@ properties:
     # listen to loopback interface so "kubectl port-forward ..." works
     nifi.web.http.network.interface.lo: lo
 
+  ## Include aditional processors
+  # customLibPath: "/opt/configuration_resources/custom_lib"
+
 ## Include additional libraries in the Nifi containers by using the postStart handler
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/
 # postStart: /opt/nifi/psql; wget -P /opt/nifi/psql https://jdbc.postgresql.org/download/postgresql-42.2.6.jar