Merge branch 'develop'

.circleci/config.yml

@@ -11,4 +11,4 @@ jobs:
             - GITHUB_PAGES_REPO: cetic/helm-charts
             - HELM_CHART: nifi
             - HELM_VERSION: 3.1.2
-          command: wget -O - https://gist.githubusercontent.com/alexnuttinck/2e9b8595e9a94ba3b3d00eea690e37ac/raw/9989a66c1de2eb4a8bce7c44ec5fbe1f43459762/publish.sh | sh
+          command: wget -O - https://raw.githubusercontent.com/cetic/helm-chart-publisher/master/publish.sh | sh

Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 0.6.1
+version: 0.6.2
 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:

README.md

@@ -1,16 +1,16 @@
-# Helm Chart for Apache Nifi
+# Helm Chart for Apache NiFi
 
 [![CircleCI](https://circleci.com/gh/cetic/helm-nifi.svg?style=svg)](https://circleci.com/gh/cetic/helm-nifi/tree/master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/helm-nifi.svg?label=release)
 
 ## Introduction
 
-This [Helm](https://github.com/kubernetes/helm) chart installs [nifi](https://nifi.apache.org/) in a Kubernetes cluster.
+This [Helm](https://helm.sh/) chart installs [Apache NiFi](https://nifi.apache.org/) in a [Kubernetes](https://kubernetes.io/) cluster.
 
 ## Prerequisites
 
 - Kubernetes cluster 1.10+
 - Helm 3.0.0+
-- PV provisioner support in the underlying infrastructure.
+- [Persistent Volumes (PV)](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) provisioner support in the underlying infrastructure.
 
 ## Installation
 
@@ -23,26 +23,42 @@ helm repo update
 
 ### Configure the chart
 
-The following items can be set via `--set` flag during installation or configured by editing the `values.yaml` directly (need to download the chart first).
+The following items can be set via `--set` flag during installation or configured by editing the [`values.yaml`](values.yaml) file directly (need to download the chart first).
 
-#### Configure the way how to expose nifi service:
+#### Configure how to expose nifi service
 
 - **Ingress**: The ingress controller must be installed in the Kubernetes cluster.
 - **ClusterIP**: Exposes the service on a cluster-internal IP. Choosing this value makes the service only reachable from within the cluster.
 - **NodePort**: Exposes the service on each Node’s IP at a static port (the NodePort). You’ll be able to contact the NodePort service, from outside the cluster, by requesting `NodeIP:NodePort`.
 - **LoadBalancer**: Exposes the service externally using a cloud provider’s load balancer.
 
-#### Configure the way how to persistent data:
+#### Configure how to persist data
 
 - **Disable**: The data does not survive the termination of a pod.
-- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamic provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you have already existing persistent volumes to use.
+- **Persistent Volume Claim(default)**: A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `storageClass` or set `existingClaim` if you have already existing persistent volumes to use.
 
-#### Configure authentication:
+#### Configure authentication
 
 - You first need a secure cluster which can be accomplished by enabling the built-in CA nifi-toolkit container (`ca.enabled` to true). By default, a secure nifi cluster uses certificate based authentication but you can optionally enable `ldap` or `oidc`. See the configuration section for more details.
 
 :warning: This feature is quite new. Please open an issue if you encounter a problem.
-We are currently working on the `ldap` authentication. Also, any help is welcome to add other authentication methods.
+It seems that versions from 0.6.1 include some bugs for authentications. Please use version 0.6.0 of the chart until it is fixed. 
+
+#### Use custom processors
+
+To add [custom processors](https://cwiki.apache.org/confluence/display/NIFI/Maven+Projects+for+Extensions#MavenProjectsforExtensions-MavenProcessorArchetype), the `values.yaml` file `nifi` section should contain the following options, where `CUSTOM_LIB_FOLDER` should be replaced by the path where the libs are:
+
+```yaml
+  extraVolumeMounts:
+    - name: mycustomlibs
+      mountPath: /opt/configuration_resources/custom_lib
+  extraVolumes: # this will create the volume from the directory
+    - name: mycustomlibs
+      hostPath:
+        path: "CUSTOM_LIB_FOLDER"
+  properties:
+    customLibPath: "/opt/configuration_resources/custom_lib"
+```
 
 ### Install the chart
 
@@ -57,7 +73,6 @@ helm install my-release cetic/nifi
 ```bash
 git clone https://github.com/cetic/helm-nifi.git nifi
 cd nifi
-helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com
 helm repo update
 helm dep up
 helm install --name nifi .
@@ -177,6 +192,7 @@ The following table lists the configurable parameters of the nifi chart and the
 | `extraVolumeMounts`                                                         | VolumeMounts for the nifi-server container (see [spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#volumemount-v1-core) for details)  | `[]`                            |
 | **env**                                                                     |
 | `env`                                                                       | Additional environment variables for the nifi-container (see [spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#envvar-v1-core) for details)  | `[]`                            |
+| `envFrom`                                                                       | Additional environment variables for the nifi-container from config-maps or secrets (see [spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#envfromsource-v1-core) for details)  | `[]`                            |
 | **extraContainers**                                                         |
 | `extraContainers`                                                           | Additional container-specifications that should run within the pod (see [spec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#container-v1-core) for details)  | `[]`                            |
 | **openshift**                                                                     |

templates/statefulset.yaml

@@ -308,6 +308,10 @@ spec:
 {{ toYaml .Values.env | indent 8 }}
 {{- end }}
 {{- if .Values.postStart }}
+{{- if .Values.envFrom }}
+        envFrom:
+{{ toYaml .Values.envFrom | indent 8 }}
+{{- end }}
         lifecycle:
           postStart:
             exec:

values.yaml

@@ -254,6 +254,15 @@ terminationGracePeriodSeconds: 30
 ## Extra environment variables that will be pass onto deployment pods
 env: []
 
+## Extra environment variables from secrets and config maps
+envFrom: []
+
+# envFrom:
+#   - configMapRef:
+#       name: config-name
+#   - secretRef:
+#       name: mysecret
+
 ## Openshift support
 ## Use the following varables in order to enable Route and Security Context Constraint creation
 openshift: