simplify datastore_crypto_key selection logic

Author: cognifloyd

templates/secrets_datastore_crypto_key.yaml

@@ -22,10 +22,10 @@ type: Opaque
 data:
   # Datastore key used to encrypt/decrypt record for the KV store
 {{- $previous := lookup "v1" "Secret" .Release.Namespace $name }}
-{{- if and $previous (not .Values.st2.datastore_crypto_key) }}
-  datastore_crypto_key: {{ $previous.data.datastore_crypto_key }}
-{{- else if .Values.st2.datastore_crypto_key }}
+{{- if .Values.st2.datastore_crypto_key }}
   datastore_crypto_key: {{ .Values.st2.datastore_crypto_key | b64enc }}
+{{- else if $previous }}
+  datastore_crypto_key: {{ $previous.data.datastore_crypto_key }}
 {{- else }}
   datastore_crypto_key: {{ tpl (.Files.Get "conf/datastore_crypto_key.yaml") . | fromYaml | toRawJson | b64enc }}
 {{- end }}