Don't use default:

Helm recommends setting the default value in the values.yaml. Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Mar 30, 2024 · aa9ae1c · aa9ae1c
1 parent c089a97
commit aa9ae1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tinkerbell/stack/templates/nginx.yaml b/tinkerbell/stack/templates/nginx.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.stack.enabled }}
 {{- $sourceInterface := .Values.stack.relay.sourceInterface -}}
 {{- $ifaceModes := dict "ipvlan" "" "macvlan" "" -}}
-{{- $dhcpInterfaceType := default "macvlan" .Values.stack.relay.interfaceMode -}}
+{{- $dhcpInterfaceType := .Values.stack.relay.interfaceMode -}}
 {{- if not (hasKey $ifaceModes $dhcpInterfaceType) -}}
   {{- fail "invalid value at .stack.relay.interfaceMode: valid modes include ipvlan and macvlan" -}}
 {{- end -}}
@@ -117,7 +117,7 @@ spec:
       {{- end }}
       {{- if $listenBroadcast }}
       initContainers:
-      - name: relay-macvlan-interface
+      - name: relay-broadcast-interface
         command:
           - /bin/sh
           - -c
@@ -131,7 +131,7 @@ spec:
             if [ -z "$srcInterface" ]; then
               srcInterface=$(nsenter -t1 -n ip route | awk '/default/ {print $5}' | head -n1)
             fi
-            # Create a macvlan interface. TODO: If this fails, try again with a different name?
+            # Create the interface. TODO: If this fails, try again with a different name?
             {{- if eq $dhcpInterfaceType "ipvlan" }}
             nsenter -t1 -n ip link add {{ $dhcpInterfaceName }} link ${srcInterface} type ipvlan mode l2
             {{- else }}
@@ -140,7 +140,7 @@ spec:
             # Move the interface into the POD.
             pid=$(echo $$)
             nsenter -t1 -n ip link set {{ $dhcpInterfaceName }} netns ${pid} || nsenter -t1 -n ip link delete {{ $dhcpInterfaceName }}
-            # Set the macvlan interface up
+            # Set the interface up
             ip link set {{ $dhcpInterfaceName }} up
             # Set the IP address
             ip addr add 127.1.1.1/32 dev {{ $dhcpInterfaceName }} noprefixroute

diff --git a/tinkerbell/stack/values.yaml b/tinkerbell/stack/values.yaml
@@ -54,7 +54,7 @@ stack:
     listenBroadcastTraffic: true
     # interfaceMode determines how we create the interface needed to listen for DHCP broadcast traffic.
     # by default macvlan is used. ipvlan is the only other option.
-    # interfaceMode: ipvlan
+    interfaceMode: macvlan
 
 # -- Overrides
 # The values defined here override those in the individual charts. Some of them require tweaking