Merge branch 'develop' into master

Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 0.5.5
+version: 0.6.0
 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:
@@ -18,12 +18,12 @@ maintainers:
     url: https://github.com/alexnuttinck
 dependencies:
   - name: zookeeper
-    version: 2.1.1
-    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
+    version: 5.23.0
+    repository: https://charts.bitnami.com/bitnami
     condition: zookeeper.enabled
   - name: nifi-registry
     alias: registry
-    version: 0.1.0
+    version: 0.1.1
     repository: https://dysnix.github.io/charts/
     condition: registry.enabled
   - name: ca

charts/ca/values.yaml

@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: apache/nifi-toolkit
   pullPolicy: IfNotPresent
-  tag: "1.11.4"
+  tag: "1.12.1"
 
 service:
   type: ClusterIP

templates/statefulset.yaml

@@ -150,6 +150,9 @@ spec:
         - name: {{ .Values.image.pullSecret }}
       {{- end }}
       containers:
+{{- if .Values.extraContainers }}
+{{- toYaml .Values.extraContainers | nindent 6 }}
+{{- end }}
       - name: server
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -375,9 +378,6 @@ spec:
           - name: "bootstrap-notification-services-xml"
             mountPath: /opt/nifi/nifi-current/conf/bootstrap-notification-services.xml
             subPath: "bootstrap-notification-services.xml"
-          - name: "logback-xml"
-            mountPath: /opt/nifi/nifi-current/conf/logback.xml
-            subPath: "logback.xml"
           - name: "login-identity-providers-xml"
             mountPath: /opt/nifi/nifi-current/conf/login-identity-providers.xml
             subPath: "login-identity-providers.xml"
@@ -480,12 +480,6 @@ spec:
           items:
             - key: "bootstrap-notification-services.xml"
               path: "bootstrap-notification-services.xml"
-      - name: "logback-xml"
-        configMap:
-          name: {{ template "apache-nifi.fullname" . }}-config
-          items:
-            - key: "logback.xml"
-              path: "logback.xml"
       - name: "login-identity-providers-xml"
         configMap:
           name: {{ template "apache-nifi.fullname" . }}-config

values.yaml

@@ -276,11 +276,12 @@ ca:
 # ------------------------------------------------------------------------------
 zookeeper:
   ## If true, install the Zookeeper chart
-  ## ref: https://github.com/kubernetes/charts/tree/master/incubator/zookeeper
+  ## ref: https://github.com/bitnami/charts/blob/master/bitnami/zookeeper/values.yaml
   enabled: true
   ## If the Zookeeper Chart is disabled a URL and port are required to connect
   url: ""
   port: 2181
+  replicaCount: 3
 
 # ------------------------------------------------------------------------------
 # Nifi registry: