Skip to content

Commit 444740c

Browse files
nowjeannowjean
committed
Resolve Conflict files & rebase & make generate-all
1 parent be4952c commit 444740c

File tree

4 files changed

+4
-45
lines changed

4 files changed

+4
-45
lines changed

‎apis/v1alpha2/zz_generated.deepcopy.go

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

‎charts/nginx-gateway-fabric/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
264264
| `certGenerator.ttlSecondsAfterFinished` | How long to wait after the cert generator job has finished before it is removed by the job controller. | int | `30` |
265265
| `clusterDomain` | The DNS cluster domain of your Kubernetes cluster. | string | `"cluster.local"` |
266266
| `gateways` | A list of Gateway objects. View https://gateway-api.sigs.k8s.io/reference/spec/#gateway for full Gateway reference. | list | `[]` |
267-
| `nginx` | The nginx section contains the configuration for all NGINX data plane deployments installed by the NGINX Gateway Fabric control plane. | object | `{"autoscaling":{"behavior":{},"enabled":true,"hpaAnnotations":{},"maxReplicas":11,"minReplicas":1,"targetCPUUtilizationPercentage":50,"targetMemoryUtilizationPercentage":50},"autoscalingTemplate":[],"config":{},"container":{"hostPorts":[],"lifecycle":{},"readinessProbe":{},"resources":{},"volumeMounts":[]},"debug":false,"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric/nginx","tag":"edge"},"imagePullSecret":"","imagePullSecrets":[],"kind":"deployment","plus":false,"pod":{},"replicas":1,"service":{"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"},"usage":{"caSecretName":"","clientSSLSecretName":"","endpoint":"","resolver":"","secretName":"nplus-license","skipVerify":false}}` |
267+
| `nginx` | The nginx section contains the configuration for all NGINX data plane deployments installed by the NGINX Gateway Fabric control plane. | object | `{"autoscaling":{"enabled":false},"autoscalingTemplate":[],"config":{},"container":{"hostPorts":[],"lifecycle":{},"readinessProbe":{},"resources":{},"volumeMounts":[]},"debug":false,"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric/nginx","tag":"edge"},"imagePullSecret":"","imagePullSecrets":[],"kind":"deployment","plus":false,"pod":{},"replicas":1,"service":{"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"},"usage":{"caSecretName":"","clientSSLSecretName":"","endpoint":"","resolver":"","secretName":"nplus-license","skipVerify":false}}` |
268268
| `nginx.config` | The configuration for the data plane that is contained in the NginxProxy resource. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{}` |
269269
| `nginx.container` | The container configuration for the NGINX container. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{"hostPorts":[],"lifecycle":{},"readinessProbe":{},"resources":{},"volumeMounts":[]}` |
270270
| `nginx.container.hostPorts` | A list of HostPorts to expose on the host. This configuration allows containers to bind to a specific port on the host node, enabling external network traffic to reach the container directly through the host's IP address and port. Use this option when you need to expose container ports on the host for direct access, such as for debugging, legacy integrations, or when NodePort/LoadBalancer services are not suitable. Note: Using hostPort may have security and scheduling implications, as it ties pods to specific nodes and ports. | list | `[]` |
@@ -292,7 +292,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
292292
| `nginx.usage.resolver` | The nameserver used to resolve the NGINX Plus usage reporting endpoint. Used with NGINX Instance Manager. | string | `""` |
293293
| `nginx.usage.secretName` | The name of the Secret containing the JWT for NGINX Plus usage reporting. Must exist in the same namespace that the NGINX Gateway Fabric control plane is running in (default namespace: nginx-gateway). | string | `"nplus-license"` |
294294
| `nginx.usage.skipVerify` | Disable client verification of the NGINX Plus usage reporting server certificate. | bool | `false` |
295-
| `nginxGateway` | The nginxGateway section contains configuration for the NGINX Gateway Fabric control plane deployment. | object | `{"affinity":{},"autoscaling":{"annotations":{},"behavior":{},"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPUUtilizationPercentage":50,"targetMemoryUtilizationPercentage":50},"autoscalingTemplate":[],"config":{"logging":{"level":"info"}},"configAnnotations":{},"extraVolumeMounts":[],"extraVolumes":[],"gatewayClassAnnotations":{},"gatewayClassName":"nginx","gatewayControllerName":"gateway.nginx.org/nginx-gateway-controller","gwAPIExperimentalFeatures":{"enable":false},"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric","tag":"edge"},"kind":"deployment","labels":{},"leaderElection":{"enable":true,"lockName":""},"lifecycle":{},"metrics":{"enable":true,"port":9113,"secure":false},"name":"","nodeSelector":{},"podAnnotations":{},"productTelemetry":{"enable":true},"readinessProbe":{"enable":true,"initialDelaySeconds":3,"port":8081},"replicas":1,"resources":{},"service":{"annotations":{},"labels":{}},"serviceAccount":{"annotations":{},"imagePullSecret":"","imagePullSecrets":[],"name":""},"snippetsFilters":{"enable":false},"terminationGracePeriodSeconds":30,"tolerations":[],"topologySpreadConstraints":[]}` |
295+
| `nginxGateway` | The nginxGateway section contains configuration for the NGINX Gateway Fabric control plane deployment. | object | `{"affinity":{},"autoscaling":{"enabled":false},"autoscalingTemplate":[],"config":{"logging":{"level":"info"}},"configAnnotations":{},"extraVolumeMounts":[],"extraVolumes":[],"gatewayClassAnnotations":{},"gatewayClassName":"nginx","gatewayControllerName":"gateway.nginx.org/nginx-gateway-controller","gwAPIExperimentalFeatures":{"enable":false},"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric","tag":"edge"},"kind":"deployment","labels":{},"leaderElection":{"enable":true,"lockName":""},"lifecycle":{},"metrics":{"enable":true,"port":9113,"secure":false},"name":"","nodeSelector":{},"podAnnotations":{},"productTelemetry":{"enable":true},"readinessProbe":{"enable":true,"initialDelaySeconds":3,"port":8081},"replicas":1,"resources":{},"service":{"annotations":{},"labels":{}},"serviceAccount":{"annotations":{},"imagePullSecret":"","imagePullSecrets":[],"name":""},"snippetsFilters":{"enable":false},"terminationGracePeriodSeconds":30,"tolerations":[],"topologySpreadConstraints":[]}` |
296296
| `nginxGateway.affinity` | The affinity of the NGINX Gateway Fabric control plane pod. | object | `{}` |
297297
| `nginxGateway.config.logging.level` | Log level. | string | `"info"` |
298298
| `nginxGateway.configAnnotations` | Set of custom annotations for NginxGateway objects. | object | `{}` |

‎charts/nginx-gateway-fabric/values.schema.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@
342342
},
343343
"container": {
344344
"description": "The container configuration for the NGINX container. This is applied globally to all Gateways managed by this\ninstance of NGINX Gateway Fabric.",
345-
<<<<<<< HEAD
346345
"properties": {
347346
"hostPorts": {
348347
"description": "A list of HostPorts to expose on the host.\nThis configuration allows containers to bind to a specific port on the host node,\nenabling external network traffic to reach the container directly through the host's IP address and port.\nUse this option when you need to expose container ports on the host for direct access,\nsuch as for debugging, legacy integrations, or when NodePort/LoadBalancer services are not suitable.\nNote: Using hostPort may have security and scheduling implications, as it ties pods to specific nodes and ports.",
@@ -396,8 +395,6 @@
396395
"type": "array"
397396
}
398397
},
399-
=======
400-
>>>>>>> Code Review
401398
"required": [],
402399
"title": "container",
403400
"type": "object"

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

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4013,15 +4013,7 @@ spec:
40134013
type: array
40144014
behavior:
40154015
description: |-
4016-
<<<<<<< HEAD
4017-
<<<<<<< HEAD
40184016
Behavior configures the scaling behavior of the target
4019-
=======
4020-
behavior configures the scaling behavior of the target
4021-
>>>>>>> Code Review
4022-
=======
4023-
Behavior configures the scaling behavior of the target
4024-
>>>>>>> Code Review & HPA event handler
40254017
in both Up and Down directions (scaleUp and scaleDown fields respectively).
40264018
If not set, the default HPAScalingRules for scale up and scale down are used.
40274019
properties:
@@ -4180,22 +4172,6 @@ spec:
41804172
enabled:
41814173
description: Enable or disable Horizontal Pod Autoscaler
41824174
type: boolean
4183-
<<<<<<< HEAD
4184-
<<<<<<< HEAD
4185-
=======
4186-
hpaAnnotations:
4187-
additionalProperties:
4188-
type: string
4189-
description: |-
4190-
Annotation for Horizontal Pod Autoscaler
4191-
Annotations is an unstructured key value map stored with a resource that may be
4192-
set by external tools to store and retrieve arbitrary metadata. They are not
4193-
queryable and should be preserved when modifying objects.
4194-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
4195-
type: object
4196-
>>>>>>> Code Review
4197-
=======
4198-
>>>>>>> Code Review
41994175
maxReplicas:
42004176
description: Maximum number of replicas.
42014177
format: int32
@@ -7727,28 +7703,14 @@ spec:
77277703
automatically if required. The default NodePort range enforced by Kubernetes is 30000-32767.
77287704
properties:
77297705
listenerPort:
7730-
<<<<<<< HEAD
77317706
description: ListenerPort is the Gateway listener port
77327707
that this NodePort maps to.
7733-
=======
7734-
description: |-
7735-
ListenerPort is the Gateway listener port that this NodePort maps to.
7736-
kubebuilder:validation:Minimum=1
7737-
kubebuilder:validation:Maximum=65535
7738-
>>>>>>> Code Review
77397708
format: int32
77407709
maximum: 65535
77417710
minimum: 1
77427711
type: integer
77437712
port:
7744-
<<<<<<< HEAD
77457713
description: Port is the NodePort to expose.
7746-
=======
7747-
description: |-
7748-
Port is the NodePort to expose.
7749-
kubebuilder:validation:Minimum=1
7750-
kubebuilder:validation:Maximum=65535
7751-
>>>>>>> Code Review
77527714
format: int32
77537715
maximum: 65535
77547716
minimum: 1

0 commit comments

Comments
 (0)