Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove nginx Smee services when Smee's in hostNetwork mode: #103

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Remove nginx Smee services when Smee's in hostNetwork mode: #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tinkerbell/stack/templates/nginx-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ data:
user root;

http {
{{- if not .Values.smee.hostNetwork }}
server {
listen {{ .Values.smee.http.port }};
location / {
Expand All @@ -26,6 +27,7 @@ data:
proxy_pass http://$smee_dns:{{ .Values.smee.http.port }};
}
}
{{- end }}

server {
listen {{ .Values.hegel.service.port }};
Expand Down Expand Up @@ -65,6 +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 }}
server {
listen {{ .Values.smee.tftp.port }} udp;
resolver $POD_NAMESERVER;
Expand All @@ -79,5 +82,6 @@ data:
proxy_pass $smee_dns:{{ .Values.smee.syslog.port }};
access_log /dev/stdout logger-json;
}
{{- end }}
}
{{- end }}
2 changes: 2 additions & 0 deletions tinkerbell/stack/templates/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ spec:
- containerPort: {{ .Values.stack.hook.port }}
protocol: TCP
name: hook-http
{{- if not .Values.smee.hostNetwork }}
- containerPort: {{ .Values.smee.http.port }}
protocol: TCP
name: {{ .Values.smee.http.name }}
Expand All @@ -69,6 +70,7 @@ spec:
- containerPort: {{ .Values.smee.syslog.port }}
protocol: UDP
name: {{ .Values.smee.syslog.name }}
{{- end }}
resources:
limits:
cpu: 500m
Expand Down
Loading