Skip to content

Commit 9ca2ff5

Browse files
salonichf5salonichf5
committed
regenerate files after rebase
1 parent 58bc8ba commit 9ca2ff5

File tree

11 files changed

+106
-56
lines changed

11 files changed

+106
-56
lines changed

‎config/tests/static-deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
- --source
3232
- /includes/main.conf
3333
- --destination
34-
- /etc/nginx/main-includes/main.conf
34+
- /etc/nginx/main-includes
3535
securityContext:
3636
seccompProfile:
3737
type: RuntimeDefault
@@ -44,7 +44,7 @@ spec:
4444
runAsUser: 102
4545
runAsGroup: 1001
4646
volumeMounts:
47-
- name: nginx-includes-configmap
47+
- name: nginx-includes-bootstrap
4848
mountPath: /includes
4949
- name: nginx-main-includes
5050
mountPath: /etc/nginx/main-includes
@@ -164,6 +164,6 @@ spec:
164164
emptyDir: {}
165165
- name: nginx-includes
166166
emptyDir: {}
167-
- name: nginx-includes-configmap
167+
- name: nginx-includes-bootstrap
168168
configMap:
169-
name: nginx-includes
169+
name: nginx-includes-bootstrap

‎deploy/aws-nlb/deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
app.kubernetes.io/instance: nginx-gateway
153153
app.kubernetes.io/name: nginx-gateway
154154
app.kubernetes.io/version: 1.5.0
155-
name: nginx-includes
155+
name: nginx-includes-bootstrap
156156
namespace: nginx-gateway
157157
---
158158
apiVersion: v1
@@ -310,7 +310,7 @@ spec:
310310
- --source
311311
- /includes/main.conf
312312
- --destination
313-
- /etc/nginx/main-includes/main.conf
313+
- /etc/nginx/main-includes
314314
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
315315
imagePullPolicy: IfNotPresent
316316
name: copy-nginx-config
@@ -327,7 +327,7 @@ spec:
327327
type: RuntimeDefault
328328
volumeMounts:
329329
- mountPath: /includes
330-
name: nginx-includes-configmap
330+
name: nginx-includes-bootstrap
331331
- mountPath: /etc/nginx/main-includes
332332
name: nginx-main-includes
333333
securityContext:
@@ -352,8 +352,8 @@ spec:
352352
- emptyDir: {}
353353
name: nginx-includes
354354
- configMap:
355-
name: nginx-includes
356-
name: nginx-includes-configmap
355+
name: nginx-includes-bootstrap
356+
name: nginx-includes-bootstrap
357357
---
358358
apiVersion: gateway.networking.k8s.io/v1
359359
kind: GatewayClass

‎deploy/azure/deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
app.kubernetes.io/instance: nginx-gateway
153153
app.kubernetes.io/name: nginx-gateway
154154
app.kubernetes.io/version: 1.5.0
155-
name: nginx-includes
155+
name: nginx-includes-bootstrap
156156
namespace: nginx-gateway
157157
---
158158
apiVersion: v1
@@ -307,7 +307,7 @@ spec:
307307
- --source
308308
- /includes/main.conf
309309
- --destination
310-
- /etc/nginx/main-includes/main.conf
310+
- /etc/nginx/main-includes
311311
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
312312
imagePullPolicy: IfNotPresent
313313
name: copy-nginx-config
@@ -324,7 +324,7 @@ spec:
324324
type: RuntimeDefault
325325
volumeMounts:
326326
- mountPath: /includes
327-
name: nginx-includes-configmap
327+
name: nginx-includes-bootstrap
328328
- mountPath: /etc/nginx/main-includes
329329
name: nginx-main-includes
330330
nodeSelector:
@@ -351,8 +351,8 @@ spec:
351351
- emptyDir: {}
352352
name: nginx-includes
353353
- configMap:
354-
name: nginx-includes
355-
name: nginx-includes-configmap
354+
name: nginx-includes-bootstrap
355+
name: nginx-includes-bootstrap
356356
---
357357
apiVersion: gateway.networking.k8s.io/v1
358358
kind: GatewayClass

‎deploy/default/deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
app.kubernetes.io/instance: nginx-gateway
153153
app.kubernetes.io/name: nginx-gateway
154154
app.kubernetes.io/version: 1.5.0
155-
name: nginx-includes
155+
name: nginx-includes-bootstrap
156156
namespace: nginx-gateway
157157
---
158158
apiVersion: v1
@@ -307,7 +307,7 @@ spec:
307307
- --source
308308
- /includes/main.conf
309309
- --destination
310-
- /etc/nginx/main-includes/main.conf
310+
- /etc/nginx/main-includes
311311
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
312312
imagePullPolicy: IfNotPresent
313313
name: copy-nginx-config
@@ -324,7 +324,7 @@ spec:
324324
type: RuntimeDefault
325325
volumeMounts:
326326
- mountPath: /includes
327-
name: nginx-includes-configmap
327+
name: nginx-includes-bootstrap
328328
- mountPath: /etc/nginx/main-includes
329329
name: nginx-main-includes
330330
securityContext:
@@ -349,8 +349,8 @@ spec:
349349
- emptyDir: {}
350350
name: nginx-includes
351351
- configMap:
352-
name: nginx-includes
353-
name: nginx-includes-configmap
352+
name: nginx-includes-bootstrap
353+
name: nginx-includes-bootstrap
354354
---
355355
apiVersion: gateway.networking.k8s.io/v1
356356
kind: GatewayClass

‎deploy/experimental-nginx-plus/deploy.yaml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,17 @@ apiVersion: v1
159159
data:
160160
main.conf: |
161161
error_log stderr info;
162+
mgmt.conf: |
163+
mgmt {
164+
enforce_initial_report off;
165+
}
162166
kind: ConfigMap
163167
metadata:
164168
labels:
165169
app.kubernetes.io/instance: nginx-gateway
166170
app.kubernetes.io/name: nginx-gateway
167171
app.kubernetes.io/version: 1.5.0
168-
name: nginx-includes
172+
name: nginx-includes-bootstrap
169173
namespace: nginx-gateway
170174
---
171175
apiVersion: v1
@@ -225,6 +229,7 @@ spec:
225229
- --config=nginx-gateway-config
226230
- --service=nginx-gateway
227231
- --nginx-plus
232+
- --usage-report-secret=nplus-license
228233
- --metrics-port=9113
229234
- --health-port=8081
230235
- --leader-election-lock-name=nginx-gateway-leader-election
@@ -315,14 +320,21 @@ spec:
315320
name: nginx-cache
316321
- mountPath: /etc/nginx/includes
317322
name: nginx-includes
323+
- mountPath: /var/lib/nginx/state
324+
name: nginx-lib
325+
- mountPath: /etc/nginx/license.jwt
326+
name: nginx-plus-license
327+
subPath: license.jwt
318328
initContainers:
319329
- command:
320330
- /usr/bin/gateway
321331
- copy
322332
- --source
323333
- /includes/main.conf
334+
- --source
335+
- /includes/mgmt.conf
324336
- --destination
325-
- /etc/nginx/main-includes/main.conf
337+
- /etc/nginx/main-includes
326338
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
327339
imagePullPolicy: IfNotPresent
328340
name: copy-nginx-config
@@ -339,7 +351,7 @@ spec:
339351
type: RuntimeDefault
340352
volumeMounts:
341353
- mountPath: /includes
342-
name: nginx-includes-configmap
354+
name: nginx-includes-bootstrap
343355
- mountPath: /etc/nginx/main-includes
344356
name: nginx-main-includes
345357
securityContext:
@@ -364,8 +376,13 @@ spec:
364376
- emptyDir: {}
365377
name: nginx-includes
366378
- configMap:
367-
name: nginx-includes
368-
name: nginx-includes-configmap
379+
name: nginx-includes-bootstrap
380+
name: nginx-includes-bootstrap
381+
- emptyDir: {}
382+
name: nginx-lib
383+
- name: nginx-plus-license
384+
secret:
385+
secretName: nplus-license
369386
---
370387
apiVersion: gateway.networking.k8s.io/v1
371388
kind: GatewayClass

‎deploy/experimental/deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ metadata:
157157
app.kubernetes.io/instance: nginx-gateway
158158
app.kubernetes.io/name: nginx-gateway
159159
app.kubernetes.io/version: 1.5.0
160-
name: nginx-includes
160+
name: nginx-includes-bootstrap
161161
namespace: nginx-gateway
162162
---
163163
apiVersion: v1
@@ -313,7 +313,7 @@ spec:
313313
- --source
314314
- /includes/main.conf
315315
- --destination
316-
- /etc/nginx/main-includes/main.conf
316+
- /etc/nginx/main-includes
317317
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
318318
imagePullPolicy: IfNotPresent
319319
name: copy-nginx-config
@@ -330,7 +330,7 @@ spec:
330330
type: RuntimeDefault
331331
volumeMounts:
332332
- mountPath: /includes
333-
name: nginx-includes-configmap
333+
name: nginx-includes-bootstrap
334334
- mountPath: /etc/nginx/main-includes
335335
name: nginx-main-includes
336336
securityContext:
@@ -355,8 +355,8 @@ spec:
355355
- emptyDir: {}
356356
name: nginx-includes
357357
- configMap:
358-
name: nginx-includes
359-
name: nginx-includes-configmap
358+
name: nginx-includes-bootstrap
359+
name: nginx-includes-bootstrap
360360
---
361361
apiVersion: gateway.networking.k8s.io/v1
362362
kind: GatewayClass

‎deploy/nginx-plus/deploy.yaml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,17 @@ apiVersion: v1
154154
data:
155155
main.conf: |
156156
error_log stderr info;
157+
mgmt.conf: |
158+
mgmt {
159+
enforce_initial_report off;
160+
}
157161
kind: ConfigMap
158162
metadata:
159163
labels:
160164
app.kubernetes.io/instance: nginx-gateway
161165
app.kubernetes.io/name: nginx-gateway
162166
app.kubernetes.io/version: 1.5.0
163-
name: nginx-includes
167+
name: nginx-includes-bootstrap
164168
namespace: nginx-gateway
165169
---
166170
apiVersion: v1
@@ -220,11 +224,10 @@ spec:
220224
- --config=nginx-gateway-config
221225
- --service=nginx-gateway
222226
- --nginx-plus
227+
- --usage-report-secret=nplus-license
223228
- --metrics-port=9113
224229
- --health-port=8081
225230
- --leader-election-lock-name=nginx-gateway-leader-election
226-
- --usage-report-secret=nginx-gateway/ngf-usage-auth
227-
- --usage-report-server-url=https://my-instance-nim.example.com
228231
env:
229232
- name: POD_IP
230233
valueFrom:
@@ -311,14 +314,21 @@ spec:
311314
name: nginx-cache
312315
- mountPath: /etc/nginx/includes
313316
name: nginx-includes
317+
- mountPath: /var/lib/nginx/state
318+
name: nginx-lib
319+
- mountPath: /etc/nginx/license.jwt
320+
name: nginx-plus-license
321+
subPath: license.jwt
314322
initContainers:
315323
- command:
316324
- /usr/bin/gateway
317325
- copy
318326
- --source
319327
- /includes/main.conf
328+
- --source
329+
- /includes/mgmt.conf
320330
- --destination
321-
- /etc/nginx/main-includes/main.conf
331+
- /etc/nginx/main-includes
322332
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
323333
imagePullPolicy: IfNotPresent
324334
name: copy-nginx-config
@@ -335,7 +345,7 @@ spec:
335345
type: RuntimeDefault
336346
volumeMounts:
337347
- mountPath: /includes
338-
name: nginx-includes-configmap
348+
name: nginx-includes-bootstrap
339349
- mountPath: /etc/nginx/main-includes
340350
name: nginx-main-includes
341351
securityContext:
@@ -360,8 +370,13 @@ spec:
360370
- emptyDir: {}
361371
name: nginx-includes
362372
- configMap:
363-
name: nginx-includes
364-
name: nginx-includes-configmap
373+
name: nginx-includes-bootstrap
374+
name: nginx-includes-bootstrap
375+
- emptyDir: {}
376+
name: nginx-lib
377+
- name: nginx-plus-license
378+
secret:
379+
secretName: nplus-license
365380
---
366381
apiVersion: gateway.networking.k8s.io/v1
367382
kind: GatewayClass

‎deploy/nodeport/deploy.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ metadata:
152152
app.kubernetes.io/instance: nginx-gateway
153153
app.kubernetes.io/name: nginx-gateway
154154
app.kubernetes.io/version: 1.5.0
155-
name: nginx-includes
155+
name: nginx-includes-bootstrap
156156
namespace: nginx-gateway
157157
---
158158
apiVersion: v1
@@ -307,7 +307,7 @@ spec:
307307
- --source
308308
- /includes/main.conf
309309
- --destination
310-
- /etc/nginx/main-includes/main.conf
310+
- /etc/nginx/main-includes
311311
image: ghcr.io/nginxinc/nginx-gateway-fabric:1.5.0
312312
imagePullPolicy: IfNotPresent
313313
name: copy-nginx-config
@@ -324,7 +324,7 @@ spec:
324324
type: RuntimeDefault
325325
volumeMounts:
326326
- mountPath: /includes
327-
name: nginx-includes-configmap
327+
name: nginx-includes-bootstrap
328328
- mountPath: /etc/nginx/main-includes
329329
name: nginx-main-includes
330330
securityContext:
@@ -349,8 +349,8 @@ spec:
349349
- emptyDir: {}
350350
name: nginx-includes
351351
- configMap:
352-
name: nginx-includes
353-
name: nginx-includes-configmap
352+
name: nginx-includes-bootstrap
353+
name: nginx-includes-bootstrap
354354
---
355355
apiVersion: gateway.networking.k8s.io/v1
356356
kind: GatewayClass

0 commit comments

Comments
 (0)