Skip to content

Commit

Permalink
nginx update for tftp (#73)
Browse files Browse the repository at this point in the history
## Description


Slow clients, which are very common for firmware iPXE, will fail with this timeout. Also, updated all DNS names to be fully qualified. Bump the stack chart version in prep for a new release.

## Why is this needed



Fixes: #

## How Has This Been Tested?





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





## 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
mergify[bot] authored Oct 27, 2023
2 parents 4ccc28d + 482f94e commit 0b87183
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tinkerbell/stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.4.1
version: 0.4.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.4.1"
appVersion: "0.4.2"

dependencies:
- name: tink
Expand Down
9 changes: 5 additions & 4 deletions tinkerbell/stack/templates/nginx-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ data:
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
resolver $POD_NAMESERVER;
set $smee_dns {{ .Values.smee.name }}.{{ .Release.Namespace }}.svc.cluster.local; # needed in Kubernetes for dynamic DNS resolution
set $smee_dns {{ .Values.smee.name }}.{{ .Release.Namespace }}.svc.cluster.local.; # needed in Kubernetes for dynamic DNS resolution
proxy_pass http://$smee_dns:{{ .Values.smee.http.port }};
}
Expand Down Expand Up @@ -55,6 +55,8 @@ data:
server {
listen {{ .Values.stack.hook.port }};
location / {
sendfile on;
sendfile_max_chunk 1m;
root /usr/share/nginx/html;
}
}
Expand All @@ -66,15 +68,14 @@ data:
server {
listen {{ .Values.smee.tftp.port }} udp;
resolver $POD_NAMESERVER;
set $smee_dns {{ .Values.smee.name }}.{{ .Release.Namespace }}.svc.cluster.local; # needed in Kubernetes for dynamic DNS resolution
set $smee_dns {{ .Values.smee.name }}.{{ .Release.Namespace }}.svc.cluster.local.; # needed in Kubernetes for dynamic DNS resolution
proxy_pass $smee_dns:{{ .Values.smee.tftp.port }};
proxy_timeout 1s;
access_log /dev/stdout logger-json;
}
server {
listen {{ .Values.smee.syslog.port }} udp;
resolver $POD_NAMESERVER;
set $smee_dns {{ .Values.smee.name }}.{{ .Release.Namespace }}.svc.cluster.local; # needed in Kubernetes for dynamic DNS resolution
set $smee_dns {{ .Values.smee.name }}.{{ .Release.Namespace }}.svc.cluster.local.; # needed in Kubernetes for dynamic DNS resolution
proxy_pass $smee_dns:{{ .Values.smee.syslog.port }};
access_log /dev/stdout logger-json;
}
Expand Down

0 comments on commit 0b87183

Please sign in to comment.