var

portworx · May 10, 2023 · c44940f · c44940f
1 parent d7eb592
commit c44940f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/charts/portworx/templates/_helpers.tpl b/charts/portworx/templates/_helpers.tpl
@@ -239,16 +239,16 @@ Generate a random token for storage provisioning
 {{- if ne .Values.etcd.credentials "null:null" }}
     {{- $result = printf "%s -userpwd %s" $result .Values.etcd.credentials }}
 {{- end }}
-{{- if ne .Values.etcd.ca "null" }}
+{{- if ne .Values.etcd.ca null }}
     {{- $result = printf "%s -ca %s" $result .Values.etcd.ca }}
 {{- end }}
-{{- if ne .Values.etcd.cert "null" }}
+{{- if ne .Values.etcd.cert null }}
     {{- $result = printf "%s -cert %s" $result .Values.etcd.cert }}
 {{- end }}
-{{- if ne .Values.etcd.key "null" }}
+{{- if ne .Values.etcd.key null }}
     {{- $result = printf "%s -key %s" $result .Values.etcd.key }}
 {{- end }}
-{{- if ne .Values.consul.token "null" }}
+{{- if ne .Values.consul.token null }}
     {{- $result = printf "%s -acltoken %s" $result .Values.consul.token }}
 {{- end }}
 {{- trim $result }}
@@ -259,7 +259,7 @@ Generate a random token for storage provisioning
 {{- if (include "px.deprecatedKvdbArgs" .) }}
     {{- $result = printf "%s %s" $result (include "px.deprecatedKvdbArgs" .) }}
 {{- end }}
-{{- if ne .Values.miscArgs "null" }}
+{{- if ne .Values.miscArgs null }}
     {{- $result = printf "%s %s" $result .Values.miscArgs }}
 {{- end }}
 {{- trim $result }}
@@ -270,7 +270,7 @@ Generate a random token for storage provisioning
 {{- if (default false .Values.isTargetOSCoreOS) }}
     {{- $result = true }}
 {{- end }}
-{{- if ne (default "null" .Values.etcd.certPath) "null" }}
+{{- if ne (default null .Values.etcd.certPath) null }}
     {{- $result = true }}
 {{- end }}
 {{- if .Values.volumes }}

diff --git a/charts/portworx/templates/hooks/post-install/px-create-cluster-token.yaml b/charts/portworx/templates/hooks/post-install/px-create-cluster-token.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.clusterToken.create }}
-{{- $registrySecret := .Values.registrySecret | default "null" }}
 apiVersion: batch/v1
 kind: Job
 metadata: