Gate changes in Stack chart for Smee:

When Smee is disabled we weren't removing references to ports and nginx conf. Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Jul 19, 2024 · 42818c8 · 42818c8
1 parent 978bc4a
commit 42818c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tinkerbell/stack/templates/nginx-configmap.yaml b/tinkerbell/stack/templates/nginx-configmap.yaml
@@ -15,7 +15,7 @@ data:
     user root;
 
     http {
-      {{- if not .Values.smee.hostNetwork }}
+      {{- if or (not .Values.smee.hostNetwork) (not .Values.smee.deploy) }}
       server {
         listen {{ .Values.smee.http.port }};
         location / {
@@ -67,7 +67,7 @@ data:
     stream {
       log_format logger-json escape=json '{"source": "nginx", "time": $msec, "address": "$remote_addr", "status": $status, "upstream_addr": "$upstream_addr"}';
 
-      {{- if not .Values.smee.hostNetwork }}
+      {{- if or (not .Values.smee.hostNetwork) (not .Values.smee.deploy) }}
       server {
           listen {{ .Values.smee.tftp.port }} udp;
           resolver $POD_NAMESERVER;

diff --git a/tinkerbell/stack/templates/nginx.yaml b/tinkerbell/stack/templates/nginx.yaml
@@ -62,7 +62,7 @@ spec:
         - containerPort: {{ .Values.stack.hook.port }}
           protocol: TCP
           name: hook-http
-        {{- if not .Values.smee.hostNetwork }}
+        {{- if or (not .Values.smee.hostNetwork) (not .Values.smee.deploy) }}
         - containerPort: {{ .Values.smee.http.port }}
           protocol: TCP
           name: {{ .Values.smee.http.name }}