Skip to content

Commit

Permalink
Merge pull request #108 from jacobweinstock/fix-smee-disabled
Browse files Browse the repository at this point in the history
Gate changes in Stack chart for Smee:

## Description

<!--- Please describe what this PR is going to change -->
When Smee is disabled we weren't removing references to ports and nginx conf lines.

## Why is this needed

<!--- Link to issue you have raised -->

Fixes: #

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->


## How are existing users impacted? What migration steps/scripts do we need?

<!--- Fixes a bug, unblocks installation, removes a component of the stack etc -->
<!--- Requires a DB migration script, etc. -->


## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade
  • Loading branch information
jacobweinstock authored Jul 19, 2024
2 parents 978bc4a + 42818c8 commit c2cc5f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tinkerbell/stack/templates/nginx-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 / {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tinkerbell/stack/templates/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit c2cc5f5

Please sign in to comment.