Skip to content

Commit 8448d09

Browse files
committed
update nginx template for TLS passthrough (#2166)
Update nginx template for TLS passthrough Problem: nginx configuration templates didn't support TLS passthrough Solution: I added a template setup fro stream servers
1 parent 7b5c6ab commit 8448d09

35 files changed

+945
-76
lines changed

charts/nginx-gateway-fabric/templates/deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ spec:
129129
volumeMounts:
130130
- name: nginx-conf
131131
mountPath: /etc/nginx/conf.d
132+
- name: nginx-stream-conf
133+
mountPath: /etc/nginx/stream-conf.d
132134
- name: module-includes
133135
mountPath: /etc/nginx/module-includes
134136
- name: nginx-secrets
@@ -166,6 +168,8 @@ spec:
166168
volumeMounts:
167169
- name: nginx-conf
168170
mountPath: /etc/nginx/conf.d
171+
- name: nginx-stream-conf
172+
mountPath: /etc/nginx/stream-conf.d
169173
- name: module-includes
170174
mountPath: /etc/nginx/module-includes
171175
- name: nginx-secrets
@@ -200,6 +204,8 @@ spec:
200204
volumes:
201205
- name: nginx-conf
202206
emptyDir: {}
207+
- name: nginx-stream-conf
208+
emptyDir: {}
203209
- name: module-includes
204210
emptyDir: {}
205211
- name: nginx-secrets

config/tests/static-deployment.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ spec:
7272
volumeMounts:
7373
- name: nginx-conf
7474
mountPath: /etc/nginx/conf.d
75+
- name: nginx-stream-conf
76+
mountPath: /etc/nginx/stream-conf.d
7577
- name: module-includes
7678
mountPath: /etc/nginx/module-includes
7779
- name: nginx-secrets
@@ -102,6 +104,8 @@ spec:
102104
volumeMounts:
103105
- name: nginx-conf
104106
mountPath: /etc/nginx/conf.d
107+
- name: nginx-stream-conf
108+
mountPath: /etc/nginx/stream-conf.d
105109
- name: module-includes
106110
mountPath: /etc/nginx/module-includes
107111
- name: nginx-secrets
@@ -121,6 +125,8 @@ spec:
121125
volumes:
122126
- name: nginx-conf
123127
emptyDir: {}
128+
- name: nginx-stream-conf
129+
emptyDir: {}
124130
- name: module-includes
125131
emptyDir: {}
126132
- name: nginx-secrets

deploy/aws-nlb/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ spec:
246246
volumeMounts:
247247
- mountPath: /etc/nginx/conf.d
248248
name: nginx-conf
249+
- mountPath: /etc/nginx/stream-conf.d
250+
name: nginx-stream-conf
249251
- mountPath: /etc/nginx/module-includes
250252
name: module-includes
251253
- mountPath: /etc/nginx/secrets
@@ -276,6 +278,8 @@ spec:
276278
volumeMounts:
277279
- mountPath: /etc/nginx/conf.d
278280
name: nginx-conf
281+
- mountPath: /etc/nginx/stream-conf.d
282+
name: nginx-stream-conf
279283
- mountPath: /etc/nginx/module-includes
280284
name: module-includes
281285
- mountPath: /etc/nginx/secrets
@@ -295,6 +299,8 @@ spec:
295299
volumes:
296300
- emptyDir: {}
297301
name: nginx-conf
302+
- emptyDir: {}
303+
name: nginx-stream-conf
298304
- emptyDir: {}
299305
name: module-includes
300306
- emptyDir: {}

deploy/azure/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ spec:
243243
volumeMounts:
244244
- mountPath: /etc/nginx/conf.d
245245
name: nginx-conf
246+
- mountPath: /etc/nginx/stream-conf.d
247+
name: nginx-stream-conf
246248
- mountPath: /etc/nginx/module-includes
247249
name: module-includes
248250
- mountPath: /etc/nginx/secrets
@@ -273,6 +275,8 @@ spec:
273275
volumeMounts:
274276
- mountPath: /etc/nginx/conf.d
275277
name: nginx-conf
278+
- mountPath: /etc/nginx/stream-conf.d
279+
name: nginx-stream-conf
276280
- mountPath: /etc/nginx/module-includes
277281
name: module-includes
278282
- mountPath: /etc/nginx/secrets
@@ -294,6 +298,8 @@ spec:
294298
volumes:
295299
- emptyDir: {}
296300
name: nginx-conf
301+
- emptyDir: {}
302+
name: nginx-stream-conf
297303
- emptyDir: {}
298304
name: module-includes
299305
- emptyDir: {}

deploy/default/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ spec:
243243
volumeMounts:
244244
- mountPath: /etc/nginx/conf.d
245245
name: nginx-conf
246+
- mountPath: /etc/nginx/stream-conf.d
247+
name: nginx-stream-conf
246248
- mountPath: /etc/nginx/module-includes
247249
name: module-includes
248250
- mountPath: /etc/nginx/secrets
@@ -273,6 +275,8 @@ spec:
273275
volumeMounts:
274276
- mountPath: /etc/nginx/conf.d
275277
name: nginx-conf
278+
- mountPath: /etc/nginx/stream-conf.d
279+
name: nginx-stream-conf
276280
- mountPath: /etc/nginx/module-includes
277281
name: module-includes
278282
- mountPath: /etc/nginx/secrets
@@ -292,6 +296,8 @@ spec:
292296
volumes:
293297
- emptyDir: {}
294298
name: nginx-conf
299+
- emptyDir: {}
300+
name: nginx-stream-conf
295301
- emptyDir: {}
296302
name: module-includes
297303
- emptyDir: {}

deploy/experimental-nginx-plus/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ spec:
256256
volumeMounts:
257257
- mountPath: /etc/nginx/conf.d
258258
name: nginx-conf
259+
- mountPath: /etc/nginx/stream-conf.d
260+
name: nginx-stream-conf
259261
- mountPath: /etc/nginx/module-includes
260262
name: module-includes
261263
- mountPath: /etc/nginx/secrets
@@ -286,6 +288,8 @@ spec:
286288
volumeMounts:
287289
- mountPath: /etc/nginx/conf.d
288290
name: nginx-conf
291+
- mountPath: /etc/nginx/stream-conf.d
292+
name: nginx-stream-conf
289293
- mountPath: /etc/nginx/module-includes
290294
name: module-includes
291295
- mountPath: /etc/nginx/secrets
@@ -305,6 +309,8 @@ spec:
305309
volumes:
306310
- emptyDir: {}
307311
name: nginx-conf
312+
- emptyDir: {}
313+
name: nginx-stream-conf
308314
- emptyDir: {}
309315
name: module-includes
310316
- emptyDir: {}

deploy/experimental/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ spec:
247247
volumeMounts:
248248
- mountPath: /etc/nginx/conf.d
249249
name: nginx-conf
250+
- mountPath: /etc/nginx/stream-conf.d
251+
name: nginx-stream-conf
250252
- mountPath: /etc/nginx/module-includes
251253
name: module-includes
252254
- mountPath: /etc/nginx/secrets
@@ -277,6 +279,8 @@ spec:
277279
volumeMounts:
278280
- mountPath: /etc/nginx/conf.d
279281
name: nginx-conf
282+
- mountPath: /etc/nginx/stream-conf.d
283+
name: nginx-stream-conf
280284
- mountPath: /etc/nginx/module-includes
281285
name: module-includes
282286
- mountPath: /etc/nginx/secrets
@@ -296,6 +300,8 @@ spec:
296300
volumes:
297301
- emptyDir: {}
298302
name: nginx-conf
303+
- emptyDir: {}
304+
name: nginx-stream-conf
299305
- emptyDir: {}
300306
name: module-includes
301307
- emptyDir: {}

deploy/nginx-plus/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ spec:
254254
volumeMounts:
255255
- mountPath: /etc/nginx/conf.d
256256
name: nginx-conf
257+
- mountPath: /etc/nginx/stream-conf.d
258+
name: nginx-stream-conf
257259
- mountPath: /etc/nginx/module-includes
258260
name: module-includes
259261
- mountPath: /etc/nginx/secrets
@@ -284,6 +286,8 @@ spec:
284286
volumeMounts:
285287
- mountPath: /etc/nginx/conf.d
286288
name: nginx-conf
289+
- mountPath: /etc/nginx/stream-conf.d
290+
name: nginx-stream-conf
287291
- mountPath: /etc/nginx/module-includes
288292
name: module-includes
289293
- mountPath: /etc/nginx/secrets
@@ -303,6 +307,8 @@ spec:
303307
volumes:
304308
- emptyDir: {}
305309
name: nginx-conf
310+
- emptyDir: {}
311+
name: nginx-stream-conf
306312
- emptyDir: {}
307313
name: module-includes
308314
- emptyDir: {}

deploy/nodeport/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ spec:
243243
volumeMounts:
244244
- mountPath: /etc/nginx/conf.d
245245
name: nginx-conf
246+
- mountPath: /etc/nginx/stream-conf.d
247+
name: nginx-stream-conf
246248
- mountPath: /etc/nginx/module-includes
247249
name: module-includes
248250
- mountPath: /etc/nginx/secrets
@@ -273,6 +275,8 @@ spec:
273275
volumeMounts:
274276
- mountPath: /etc/nginx/conf.d
275277
name: nginx-conf
278+
- mountPath: /etc/nginx/stream-conf.d
279+
name: nginx-stream-conf
276280
- mountPath: /etc/nginx/module-includes
277281
name: module-includes
278282
- mountPath: /etc/nginx/secrets
@@ -292,6 +296,8 @@ spec:
292296
volumes:
293297
- emptyDir: {}
294298
name: nginx-conf
299+
- emptyDir: {}
300+
name: nginx-stream-conf
295301
- emptyDir: {}
296302
name: module-includes
297303
- emptyDir: {}

deploy/openshift/deploy.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ spec:
251251
volumeMounts:
252252
- mountPath: /etc/nginx/conf.d
253253
name: nginx-conf
254+
- mountPath: /etc/nginx/stream-conf.d
255+
name: nginx-stream-conf
254256
- mountPath: /etc/nginx/module-includes
255257
name: module-includes
256258
- mountPath: /etc/nginx/secrets
@@ -281,6 +283,8 @@ spec:
281283
volumeMounts:
282284
- mountPath: /etc/nginx/conf.d
283285
name: nginx-conf
286+
- mountPath: /etc/nginx/stream-conf.d
287+
name: nginx-stream-conf
284288
- mountPath: /etc/nginx/module-includes
285289
name: module-includes
286290
- mountPath: /etc/nginx/secrets
@@ -300,6 +304,8 @@ spec:
300304
volumes:
301305
- emptyDir: {}
302306
name: nginx-conf
307+
- emptyDir: {}
308+
name: nginx-stream-conf
303309
- emptyDir: {}
304310
name: module-includes
305311
- emptyDir: {}

0 commit comments

Comments
 (0)