Skip to content

Commit a48dbf0

Browse files
salonichf5salonichf5
committed
fix chart rendering
1 parent e38610b commit a48dbf0

File tree

15 files changed

+152
-59
lines changed

15 files changed

+152
-59
lines changed

‎apis/v1alpha2/nginxproxy_types.go

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -390,15 +390,33 @@ type KubernetesSpec struct {
390390

391391
// Deployment is the configuration for the NGINX Deployment.
392392
type DeploymentSpec struct {
393+
// Container defines container fields for the NGINX container.
394+
//
395+
// +optional
393396
Container ContainerSpec `json:"container"`
394-
Replicas *int32 `json:"replicas,omitempty"`
395-
Pod PodSpec `json:"pod"`
397+
398+
// Number of desired Pods.
399+
//
400+
// +optional
401+
Replicas *int32 `json:"replicas,omitempty"`
402+
403+
// Pod defines Pod-specific fields.
404+
//
405+
// +optional
406+
Pod PodSpec `json:"pod"`
396407
}
397408

398409
// DaemonSet is the configuration for the NGINX DaemonSet.
399410
type DaemonSetSpec struct {
411+
// Container defines container fields for the NGINX container.
412+
//
413+
// +optional
400414
Container ContainerSpec `json:"container"`
401-
Pod PodSpec `json:"pod"`
415+
416+
// Pod defines Pod-specific fields.
417+
//
418+
// +optional
419+
Pod PodSpec `json:"pod"`
402420
}
403421

404422
// PodSpec defines Pod-specific fields.
@@ -446,13 +464,42 @@ type PodSpec struct {
446464

447465
// ContainerSpec defines container fields for the NGINX container.
448466
type ContainerSpec struct {
449-
Debug *bool `json:"debug,omitempty"`
450-
Image *Image `json:"image,omitempty"`
451-
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
452-
Lifecycle *corev1.Lifecycle `json:"lifecycle,omitempty"`
453-
ReadinessProbe *ReadinessProbeSpec `json:"readinessProbe,omitempty"`
454-
HostPorts []HostPort `json:"hostPorts,omitempty"`
455-
VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`
467+
// Debug enables debugging for NGINX by using the nginx-debug binary.
468+
//
469+
// +optional
470+
Debug *bool `json:"debug,omitempty"`
471+
472+
// Image is the NGINX image to use.
473+
//
474+
// +optional
475+
Image *Image `json:"image,omitempty"`
476+
477+
// Resources describes the compute resource requirements.
478+
//
479+
// +optional
480+
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
481+
482+
// Lifecycle describes actions that the management system should take in response to container lifecycle
483+
// events. For the PostStart and PreStop lifecycle handlers, management of the container blocks
484+
// until the action is complete, unless the container process fails, in which case the handler is aborted.
485+
//
486+
// +optional
487+
Lifecycle *corev1.Lifecycle `json:"lifecycle,omitempty"`
488+
489+
// ReadinessProbe defines the readiness probe for the NGINX container.
490+
//
491+
// +optional
492+
ReadinessProbe *ReadinessProbeSpec `json:"readinessProbe,omitempty"`
493+
494+
// HostPorts are the list of ports to expose on the host.
495+
//
496+
// +optional
497+
HostPorts []HostPort `json:"hostPorts,omitempty"`
498+
499+
// VolumeMounts describe the mounting of Volumes within a container.
500+
//
501+
// +optional
502+
VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`
456503
}
457504

458505
// ReadinessProbeSpec defines the configuration for the NGINX readiness probe.

‎apis/v1alpha2/zz_generated.deepcopy.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/nginx-gateway-fabric/templates/nginxproxy.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ spec:
2626
{{- end }}
2727
image:
2828
{{- toYaml .Values.nginx.image | nindent 10 }}
29+
readinessProbe:
30+
{{- toYaml .Values.nginx.readinessProbe | nindent 10 }}
2931
{{- if .Values.nginx.debug }}
3032
debug: {{ .Values.nginx.debug }}
3133
{{- end }}
@@ -49,7 +51,7 @@ spec:
4951
debug: {{ .Values.nginx.debug }}
5052
{{- end }}
5153
readinessProbe:
52-
port: {{ .Values.nginx.readinessProbe.port | default 8081 }}
54+
{{- toYaml .Values.nginx.readinessProbe | nindent 10 }}
5355
{{- end }}
5456
{{- if .Values.nginx.service }}
5557
service:

‎config/crd/bases/gateway.nginx.org_nginxproxies.yaml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,16 @@ spec:
7474
description: DaemonSet is the configuration for the NGINX DaemonSet.
7575
properties:
7676
container:
77-
description: ContainerSpec defines container fields for the
78-
NGINX container.
77+
description: Container defines container fields for the NGINX
78+
container.
7979
properties:
8080
debug:
81+
description: Debug enables debugging for NGINX by using
82+
the nginx-debug binary.
8183
type: boolean
8284
hostPorts:
85+
description: HostPorts are the list of ports to expose
86+
on the host.
8387
items:
8488
description: HostPort exposes an nginx container port
8589
on the host.
@@ -359,8 +363,8 @@ spec:
359363
type: string
360364
type: object
361365
readinessProbe:
362-
description: ReadinessProbeSpec defines the configuration
363-
for the NGINX readiness probe.
366+
description: ReadinessProbe defines the readiness probe
367+
for the NGINX container.
364368
properties:
365369
exec:
366370
description: Exec specifies a command to execute in
@@ -523,8 +527,8 @@ spec:
523527
type: integer
524528
type: object
525529
resources:
526-
description: ResourceRequirements describes the compute
527-
resource requirements.
530+
description: Resources describes the compute resource
531+
requirements.
528532
properties:
529533
claims:
530534
description: |-
@@ -584,6 +588,8 @@ spec:
584588
type: object
585589
type: object
586590
volumeMounts:
591+
description: VolumeMounts describe the mounting of Volumes
592+
within a container.
587593
items:
588594
description: VolumeMount describes a mounting of a Volume
589595
within a container.
@@ -648,7 +654,7 @@ spec:
648654
type: array
649655
type: object
650656
pod:
651-
description: PodSpec defines Pod-specific fields.
657+
description: Pod defines Pod-specific fields.
652658
properties:
653659
affinity:
654660
description: Affinity is the pod's scheduling constraints.
@@ -3636,22 +3642,23 @@ spec:
36363642
type: object
36373643
type: array
36383644
type: object
3639-
required:
3640-
- container
3641-
- pod
36423645
type: object
36433646
deployment:
36443647
description: |-
36453648
Deployment is the configuration for the NGINX Deployment.
36463649
This is the default deployment option.
36473650
properties:
36483651
container:
3649-
description: ContainerSpec defines container fields for the
3650-
NGINX container.
3652+
description: Container defines container fields for the NGINX
3653+
container.
36513654
properties:
36523655
debug:
3656+
description: Debug enables debugging for NGINX by using
3657+
the nginx-debug binary.
36533658
type: boolean
36543659
hostPorts:
3660+
description: HostPorts are the list of ports to expose
3661+
on the host.
36553662
items:
36563663
description: HostPort exposes an nginx container port
36573664
on the host.
@@ -3931,8 +3938,8 @@ spec:
39313938
type: string
39323939
type: object
39333940
readinessProbe:
3934-
description: ReadinessProbeSpec defines the configuration
3935-
for the NGINX readiness probe.
3941+
description: ReadinessProbe defines the readiness probe
3942+
for the NGINX container.
39363943
properties:
39373944
exec:
39383945
description: Exec specifies a command to execute in
@@ -4095,8 +4102,8 @@ spec:
40954102
type: integer
40964103
type: object
40974104
resources:
4098-
description: ResourceRequirements describes the compute
4099-
resource requirements.
4105+
description: Resources describes the compute resource
4106+
requirements.
41004107
properties:
41014108
claims:
41024109
description: |-
@@ -4156,6 +4163,8 @@ spec:
41564163
type: object
41574164
type: object
41584165
volumeMounts:
4166+
description: VolumeMounts describe the mounting of Volumes
4167+
within a container.
41594168
items:
41604169
description: VolumeMount describes a mounting of a Volume
41614170
within a container.
@@ -4220,7 +4229,7 @@ spec:
42204229
type: array
42214230
type: object
42224231
pod:
4223-
description: PodSpec defines Pod-specific fields.
4232+
description: Pod defines Pod-specific fields.
42244233
properties:
42254234
affinity:
42264235
description: Affinity is the pod's scheduling constraints.
@@ -7209,11 +7218,9 @@ spec:
72097218
type: array
72107219
type: object
72117220
replicas:
7221+
description: Number of desired Pods.
72127222
format: int32
72137223
type: integer
7214-
required:
7215-
- container
7216-
- pod
72177224
type: object
72187225
service:
72197226
description: Service is the configuration for the NGINX Service.

‎deploy/azure/deploy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ spec:
417417
pullPolicy: Always
418418
repository: ghcr.io/nginx/nginx-gateway-fabric/nginx
419419
tag: edge
420+
readinessProbe: {}
420421
pod:
421422
nodeSelector:
422423
kubernetes.io/os: linux

0 commit comments

Comments
 (0)