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

Move nginx.conf to ConfigMap #678

Merged
merged 1 commit into from
May 31, 2023
Merged

Move nginx.conf to ConfigMap #678

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
41 changes: 34 additions & 7 deletions deploy/manifests/nginx-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,27 @@ roleRef:
name: nginx-gateway
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
kind: ConfigMap
metadata:
name: nginx-conf
namespace: nginx-gateway
data:
nginx.conf: |
load_module /usr/lib/nginx/modules/ngx_http_js_module.so;

events {}

pid /etc/nginx/nginx.pid;
error_log stderr debug;

http {
include /etc/nginx/conf.d/*.conf;
js_import /usr/lib/nginx/modules/njs/httpmatches.js;
server_names_hash_bucket_size 256;
server_names_hash_max_size 1024;
}
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -87,26 +108,29 @@ spec:
shareProcessNamespace: true
serviceAccountName: nginx-gateway
volumes:
- name: nginx-config
- name: nginx
emptyDir: { }
- name: nginx-conf
configMap:
name: nginx-conf
- name: var-lib-nginx
emptyDir: { }
- name: njs-modules
configMap:
name: njs-modules
initContainers:
- image: busybox:1.34 # FIXME(pleshakov): use gateway container to init the Config with proper main config
name: nginx-config-initializer
command: [ 'sh', '-c', 'echo "load_module /usr/lib/nginx/modules/ngx_http_js_module.so; events {} pid /etc/nginx/nginx.pid; error_log stderr debug; http { include /etc/nginx/conf.d/*.conf; js_import /usr/lib/nginx/modules/njs/httpmatches.js; server_names_hash_bucket_size 256; server_names_hash_max_size 1024; }" > /etc/nginx/nginx.conf && (rm -r /etc/nginx/conf.d /etc/nginx/secrets; mkdir /etc/nginx/conf.d /etc/nginx/secrets && chown 1001:0 /etc/nginx/conf.d /etc/nginx/secrets)' ]
- image: busybox:1.36
pleshakov marked this conversation as resolved.
Show resolved Hide resolved
name: set-permissions
command: [ 'sh', '-c', 'rm -r /etc/nginx/conf.d /etc/nginx/secrets; mkdir /etc/nginx/conf.d /etc/nginx/secrets && chown 1001:0 /etc/nginx/conf.d /etc/nginx/secrets' ]
volumeMounts:
- name: nginx-config
- name: nginx
mountPath: /etc/nginx
containers:
- image: ghcr.io/nginxinc/nginx-kubernetes-gateway:edge
imagePullPolicy: Always
name: nginx-gateway
volumeMounts:
- name: nginx-config
- name: nginx
mountPath: /etc/nginx
securityContext:
runAsUser: 1001
Expand All @@ -133,8 +157,11 @@ spec:
- name: https
containerPort: 443
volumeMounts:
- name: nginx-config
- name: nginx
mountPath: /etc/nginx
- name: nginx-conf
mountPath: /etc/nginx/nginx.conf
subPath: nginx.conf
- name: var-lib-nginx
mountPath: /var/lib/nginx
- name: njs-modules
Expand Down