remove defaults in helm templating in favor of explicitly setting the…

… value in the values file (and still allow for override).
elastiflow · Apr 24, 2024 · 2913344 · 2913344
1 parent 56099b9
commit 2913344
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/netobserv/templates/maxmind-secret.yaml b/charts/netobserv/templates/maxmind-secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.maxmind.secretRef | default "maxmind-license" }}
+  name: {{ .Values.maxmind.secretRef }}
 type: Opaque
 data:
   license: {{ .Values.maxmind.licenseKey | b64enc }}

diff --git a/charts/netobserv/templates/netobserv-secret.yaml b/charts/netobserv/templates/netobserv-secret.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.license.secretRef | default "netobserv-license" }}
+  name: {{ .Values.license.secretRef }}
   labels:
     {{- include "netobserv.labels" . | nindent 4 }}
 type: Opaque

diff --git a/charts/netobserv/values.yaml b/charts/netobserv/values.yaml
@@ -72,7 +72,7 @@ license:
   createSecret: false
   # Secret name to be used for the license. If empty, the secret name defaults to `netobserv-license`
   # If no secret with a matching name exists, the value will be set from `licenseKey`.instead.
-  secretRef: ""
+  secretRef: "netobserv-license"
   # Set license key, if not set, value from secret will be used
   licenseKey: ""
 
@@ -84,7 +84,7 @@ maxmind:
   createSecret: false
   # Secret name to be used for the license. If empty, the secret name defaults to `maxmind-license`
   # If no secret with a matching name exists, the value will be set from `licenseKey`.instead.
-  secretRef: ""
+  secretRef: "maxmind-license"
   # Enabling asn will look up the autonomous system number and autonomous system
   # organization associated with IPv4 and IPv6 addresses.
   asnEnabled: false