Merge pull request #8 from small-hack/proxied2

pull nginx config from values file for faster iteration
This commit is contained in:
Max! 2025-09-29 13:19:20 +02:00 committed by GitHub
commit 5d84d9c391
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 26 additions and 20 deletions

View file

@ -18,7 +18,7 @@ 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: 1.10.0
version: 1.11.0
# renovate: image=docker.io/ghost
appVersion: "6.0.10"

View file

@ -1,6 +1,6 @@
# ghost
![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.10](https://img.shields.io/badge/AppVersion-6.0.10-informational?style=flat-square)
![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.10](https://img.shields.io/badge/AppVersion-6.0.10-informational?style=flat-square)
A Helm chart for deploying Ghost on Kubernetes
@ -110,7 +110,8 @@ A Helm chart for deploying Ghost on Kubernetes
| podAnnotations | object | `{}` | This is for setting Kubernetes Annotations to a Pod. For more info checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ |
| podLabels | object | `{}` | This is for setting Kubernetes Labels to a Pod. For more info checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ |
| podSecurityContext | object | `{}` | Configure Pods Security Context ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod |
| proxy | object | `{"enabled":true}` | Options for embedded nginx reverse-proxy |
| proxy | object | `{"config":"user nginx;\nworker_processes 1;\nevents {\n worker_connections 10240;\n}\nhttp {\n server {\n listen 80;\n server_name 0.0.0.0;\n location / {\n root /usr/share/nginx/html; #Change this line\n index index.html index.htm;\n }\n }\n}","enabled":true}` | Options for embedded nginx reverse-proxy |
| proxy.config | string | `"user nginx;\nworker_processes 1;\nevents {\n worker_connections 10240;\n}\nhttp {\n server {\n listen 80;\n server_name 0.0.0.0;\n location / {\n root /usr/share/nginx/html; #Change this line\n index index.html index.htm;\n }\n }\n}"` | config to be mounted into the nginx container |
| proxy.enabled | bool | `true` | enable/disable the embedded proxy |
| readinessProbe.httpGet.path | string | `"/"` | |
| readinessProbe.httpGet.port | string | `"http"` | |

View file

@ -1,15 +0,0 @@
user nginx;
worker_processes 1;
events {
worker_connections 10240;
}
http {
server {
listen 80;
server_name 0.0.0.0;
location / {
root /usr/share/nginx/html; #Change this line
index index.html index.htm;
}
}
}

View file

@ -5,7 +5,9 @@ kind: ConfigMap
metadata:
name: nginx-conf
data:
nginx.conf: |
{{- .Files.Get "files/nginx.conf" | nindent 4 }}
{{- with .Values.proxy.config }}
nginx.conf:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}

View file

@ -358,3 +358,21 @@ activity_pub:
proxy:
# -- enable/disable the embedded proxy
enabled: true
# -- config to be mounted into the nginx container
config: |-
user nginx;
worker_processes 1;
events {
worker_connections 10240;
}
http {
server {
listen 80;
server_name 0.0.0.0;
location / {
root /usr/share/nginx/html; #Change this line
index index.html index.htm;
}
}
}