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

Apply configuration of SnippetsFilters to NGINX #2604

Merged
merged 16 commits into from
Sep 30, 2024
Merged

Apply configuration of SnippetsFilters to NGINX #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ced8d6b
Finish implementing SnippetsFilter
kate-osborn Sep 19, 2024
ad68493
Fix auto formatting issues
kate-osborn Sep 25, 2024
64b7932
Fix backend refs test
kate-osborn Sep 25, 2024
b40f965
Update include path in nginx-plus.conf
kate-osborn Sep 25, 2024
8b716e4
Remove unnecessary len check
kate-osborn Sep 25, 2024
0759700
Add comments to includes.go
kate-osborn Sep 25, 2024
f5b3c08
Move convert func to convert.go
kate-osborn Sep 25, 2024
283318d
Fix typos
kate-osborn Sep 25, 2024
9743f11
Fix parallel placement
kate-osborn Sep 25, 2024
081b89e
Add comment about validation
kate-osborn Sep 25, 2024
17993ce
More formatting changes
kate-osborn Sep 25, 2024
2adb90e
Some more formatting reverts
kate-osborn Sep 25, 2024
45c86b2
One more formatting revert
kate-osborn Sep 25, 2024
8979e48
More typo fixes
kate-osborn Sep 26, 2024
1cfbac5
Code review
kate-osborn Sep 26, 2024
9fa6127
Swap actual/expected in server test
kate-osborn Sep 30, 2024
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
10 changes: 5 additions & 5 deletions charts/nginx-gateway-fabric/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ spec:
mountPath: /etc/nginx/conf.d
- name: nginx-stream-conf
mountPath: /etc/nginx/stream-conf.d
- name: module-includes
mountPath: /etc/nginx/module-includes
- name: nginx-main-includes
mountPath: /etc/nginx/main-includes
- name: nginx-secrets
mountPath: /etc/nginx/secrets
- name: nginx-run
Expand Down Expand Up @@ -173,8 +173,8 @@ spec:
mountPath: /etc/nginx/conf.d
- name: nginx-stream-conf
mountPath: /etc/nginx/stream-conf.d
- name: module-includes
mountPath: /etc/nginx/module-includes
- name: nginx-main-includes
mountPath: /etc/nginx/main-includes
- name: nginx-secrets
mountPath: /etc/nginx/secrets
- name: nginx-run
Expand Down Expand Up @@ -209,7 +209,7 @@ spec:
emptyDir: {}
- name: nginx-stream-conf
emptyDir: {}
- name: module-includes
- name: nginx-main-includes
emptyDir: {}
- name: nginx-secrets
emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions config/tests/static-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ spec:
mountPath: /etc/nginx/conf.d
- name: nginx-stream-conf
mountPath: /etc/nginx/stream-conf.d
- name: module-includes
mountPath: /etc/nginx/module-includes
- name: nginx-main-includes
mountPath: /etc/nginx/main-includes
- name: nginx-secrets
mountPath: /etc/nginx/secrets
- name: nginx-run
Expand Down Expand Up @@ -106,8 +106,8 @@ spec:
mountPath: /etc/nginx/conf.d
- name: nginx-stream-conf
mountPath: /etc/nginx/stream-conf.d
- name: module-includes
mountPath: /etc/nginx/module-includes
- name: nginx-main-includes
mountPath: /etc/nginx/main-includes
- name: nginx-secrets
mountPath: /etc/nginx/secrets
- name: nginx-run
Expand All @@ -127,7 +127,7 @@ spec:
emptyDir: {}
- name: nginx-stream-conf
emptyDir: {}
- name: module-includes
- name: nginx-main-includes
emptyDir: {}
- name: nginx-secrets
emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/aws-nlb/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -280,8 +280,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -302,7 +302,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/azure/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -277,8 +277,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -301,7 +301,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/default/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -277,8 +277,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -299,7 +299,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/experimental-nginx-plus/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -292,8 +292,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -314,7 +314,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/experimental/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -283,8 +283,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -305,7 +305,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/nginx-plus/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -288,8 +288,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -310,7 +310,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/nodeport/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -277,8 +277,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -299,7 +299,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/openshift/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -285,8 +285,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -307,7 +307,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/snippets-filters-nginx-plus/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -289,8 +289,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -311,7 +311,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
10 changes: 5 additions & 5 deletions deploy/snippets-filters/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand Down Expand Up @@ -280,8 +280,8 @@ spec:
name: nginx-conf
- mountPath: /etc/nginx/stream-conf.d
name: nginx-stream-conf
- mountPath: /etc/nginx/module-includes
name: module-includes
- mountPath: /etc/nginx/main-includes
name: nginx-main-includes
- mountPath: /etc/nginx/secrets
name: nginx-secrets
- mountPath: /var/run/nginx
Expand All @@ -302,7 +302,7 @@ spec:
- emptyDir: {}
name: nginx-stream-conf
- emptyDir: {}
name: module-includes
name: nginx-main-includes
- emptyDir: {}
name: nginx-secrets
- emptyDir: {}
Expand Down
Loading
Loading