From 2c5fdc0f7d0361f0a895aac8f7a02efd4a535416 Mon Sep 17 00:00:00 2001
From: Bill Nickless <59262407+wknickless@users.noreply.github.com>
Date: Mon, 21 Jun 2021 04:07:05 -0700
Subject: [PATCH] Re-enable safetyValve if OIDC is not enabled / clusterSecure
 false (#148)

* Re-enable safetyValve if OIDC is not enabled and clusterSecure is false (commit dbc0712785298c898d80dc4d10100cacec33a102 pulled in too much)
---
 Chart.yaml                 | 2 +-
 templates/statefulset.yaml | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index b9cb8ee4..9d7fe65f 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 0.7.7
+version: 0.7.8
 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:
diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
index b11bb2e0..a79900be 100644
--- a/templates/statefulset.yaml
+++ b/templates/statefulset.yaml
@@ -218,6 +218,8 @@ spec:
           prop_replace nifi.security.truststoreType jks
           prop_replace nifi.security.truststore   ${NIFI_HOME}/config-data/certs/truststore.jks
           prop_replace nifi.security.truststorePasswd   $(jq -r .trustStorePassword ${NIFI_HOME}/config-data/certs/config.json)
+{{- end }}
+{{- end }}
 
 {{- if .Values.properties.webProxyHost }}
           # Update nifi.properties for web ui proxy hostname
@@ -226,15 +228,11 @@ spec:
           prop_replace nifi.web.proxy.host {{ template "apache-nifi.fullname" . }}.{{ .Release.Namespace }}.svc
 {{- end }}
 
-
-{{- end }}
-
 {{- if .Values.properties.safetyValve }}
   {{- range $prop, $val := .Values.properties.safetyValve }}
           prop_replace {{ $prop }} "{{ $val }}" nifi.properties
   {{- end }}
 {{- end }}
-{{- end }}
 
 
           exec bin/nifi.sh run & nifi_pid="$!"