Hpa #3492
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -264,16 +264,18 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | |
| | `certGenerator.ttlSecondsAfterFinished` | How long to wait after the cert generator job has finished before it is removed by the job controller. | int | `30` | | ||
| | `clusterDomain` | The DNS cluster domain of your Kubernetes cluster. | string | `"cluster.local"` | | ||
| | `gateways` | A list of Gateway objects. View https://gateway-api.sigs.k8s.io/reference/spec/#gateway for full Gateway reference. | list | `[]` | | ||
| | `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":{"resources":{}},"debug":false,"image":{"pullPolicy":"Always","repository":"ghcr.io/nginx/nginx-gateway-fabric/nginx","tag":"edge"},"imagePullSecret":"","imagePullSecrets":[],"kind":"deployment","plus":false,"pod":{"tolerations":[]},"replicas":1,"service":{"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"},"usage":{"caSecretName":"","clientSSLSecretName":"","endpoint":"","resolver":"","secretName":"nplus-license","skipVerify":false}}` | | ||
| | `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 | `{}` | | ||
| | `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 | `{"resources":{}}` | | ||
| | `nginx.container.resources` | The resource requirements of the NGINX container. You should be set this value, If you want to use dataplane Autoscaling(HPA). | object | `{}` | | ||
| | `nginx.debug` | Enable debugging for NGINX. Uses the nginx-debug binary. The NGINX error log level should be set to debug in the NginxProxy resource. | bool | `false` | | ||
| | `nginx.image.repository` | The NGINX image to use. | string | `"ghcr.io/nginx/nginx-gateway-fabric/nginx"` | | ||
| | `nginx.imagePullSecret` | The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. The control plane will copy this secret into any namespace where NGINX is deployed. | string | `""` | | ||
| | `nginx.imagePullSecrets` | A list of secret names containing docker registry credentials. Secrets must exist in the same namespace as the helm release. The control plane will copy these secrets into any namespace where NGINX is deployed. | list | `[]` | | ||
| | `nginx.kind` | The kind of NGINX deployment. | string | `"deployment"` | | ||
| | `nginx.plus` | Is NGINX Plus image being used. | bool | `false` | | ||
| | `nginx.pod` | The pod configuration for the NGINX data plane pod. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{"tolerations":[]}` | | ||
| | `nginx.pod.tolerations` | Tolerations for the NGINX data plane pod. | list | `[]` | | ||
| | `nginx.replicas` | The number of replicas of the NGINX Deployment. | int | `1` | | ||
| | `nginx.service` | The service configuration for the NGINX data plane. This is applied globally to all Gateways managed by this instance of NGINX Gateway Fabric. | object | `{"externalTrafficPolicy":"Local","loadBalancerClass":"","loadBalancerIP":"","loadBalancerSourceRanges":[],"nodePorts":[],"type":"LoadBalancer"}` | | ||
| | `nginx.service.externalTrafficPolicy` | The externalTrafficPolicy of the service. The value Local preserves the client source IP. | string | `"Local"` | | ||
|
|
@@ -288,7 +290,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | |
| | `nginx.usage.resolver` | The nameserver used to resolve the NGINX Plus usage reporting endpoint. Used with NGINX Instance Manager. | string | `""` | | ||
| | `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"` | | ||
| | `nginx.usage.skipVerify` | Disable client verification of the NGINX Plus usage reporting server certificate. | bool | `false` | | ||
| | `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},"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":[]}` | | ||
| | `nginxGateway.affinity` | The affinity of the NGINX Gateway Fabric control plane pod. | object | `{}` | | ||
| | `nginxGateway.config.logging.level` | Log level. | string | `"info"` | | ||
| | `nginxGateway.configAnnotations` | Set of custom annotations for NginxGateway objects. | object | `{}` | | ||
|
|
@@ -308,7 +310,6 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | |
| | `nginxGateway.metrics.enable` | Enable exposing metrics in the Prometheus format. | bool | `true` | | ||
| | `nginxGateway.metrics.port` | Set the port where the Prometheus metrics are exposed. | int | `9113` | | ||
| | `nginxGateway.metrics.secure` | Enable serving metrics via https. By default metrics are served via http. Please note that this endpoint will be secured with a self-signed certificate. | bool | `false` | | ||
| | `nginxGateway.nodeSelector` | The nodeSelector of the NGINX Gateway Fabric control plane pod. | object | `{}` | | ||
| | `nginxGateway.podAnnotations` | Set of custom annotations for the NGINX Gateway Fabric pods. | object | `{}` | | ||
| | `nginxGateway.productTelemetry.enable` | Enable the collection of product telemetry. | bool | `true` | | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,13 +8,15 @@ rules: | |
| - apiGroups: | ||
| - "" | ||
| - apps | ||
| - autoscaling | ||
| resources: | ||
| - secrets | ||
| - configmaps | ||
| - serviceaccounts | ||
| - services | ||
| - deployments | ||
| - daemonsets | ||
| - horizontalpodautoscalers | ||
| verbs: | ||
| - create | ||
| - update | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| {{- if and (eq .Values.nginxGateway.kind "deployment") .Values.nginxGateway.autoscaling.enabled -}} | ||
| apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }} | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| {{- with .Values.nginxGateway.autoscaling.annotations }} | ||
| annotations: {{ toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "nginx-gateway.labels" . | nindent 4 }} | ||
| {{- with .Values.nginxGateway.labels }} | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| name: {{ include "nginx-gateway.fullname" . }} | ||
| namespace: {{ .Release.Namespace }} | ||
| spec: | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: {{ include "nginx-gateway.fullname" . }} | ||
| minReplicas: {{ .Values.nginxGateway.autoscaling.minReplicas }} | ||
| maxReplicas: {{ .Values.nginxGateway.autoscaling.maxReplicas }} | ||
| metrics: | ||
| {{- with .Values.nginxGateway.autoscaling.targetMemoryUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: memory | ||
| target: | ||
| type: Utilization | ||
| averageUtilization: {{ . }} | ||
| {{- end }} | ||
| {{- with .Values.nginxGateway.autoscaling.targetCPUUtilizationPercentage }} | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| type: Utilization | ||
| averageUtilization: {{ . }} | ||
| {{- end }} | ||
| {{- with .Values.autoscalingTemplate }} | ||
| {{- toYaml . | nindent 2 }} | ||
| {{- end }} | ||
| {{- with .Values.nginxGateway.autoscaling.behavior }} | ||
| behavior: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,27 @@ spec: | |
| kubernetes: | ||
| {{- if eq .Values.nginx.kind "deployment" }} | ||
| deployment: | ||
| {{- if .Values.nginx.replicas }} | ||
| replicas: {{ .Values.nginx.replicas }} | ||
| {{- end }} | ||
| autoscaling: | ||
| enabled: {{ .Values.nginx.autoscaling.enabled }} | ||
| {{- if .Values.nginx.autoscaling.hpaAnnotations }} | ||
| hpaAnnotations: | ||
| {{- toYaml .Values.nginx.autoscaling.hpaAnnotations | nindent 10 }} | ||
| {{- end }} | ||
| minReplicas: {{ .Values.nginx.autoscaling.minReplicas }} | ||
| maxReplicas: {{ .Values.nginx.autoscaling.maxReplicas }} | ||
| targetCPUUtilizationPercentage: {{ .Values.nginx.autoscaling.targetCPUUtilizationPercentage }} | ||
| targetMemoryUtilizationPercentage: {{ .Values.nginx.autoscaling.targetMemoryUtilizationPercentage }} | ||
| {{- if .Values.nginx.autoscaling.behavior }} | ||
| behavior: | ||
| {{- toYaml .Values.nginx.autoscaling.behavior | nindent 10 }} | ||
| {{- end }} | ||
| {{- if .Values.nginx.autoscalingTemplate }} | ||
| autoscalingTemplate: | ||
| {{- toYaml .Values.nginx.autoscalingTemplate | nindent 8 }} | ||
| {{- end }} | ||
|
Comment on lines
+18
to
+35
There was a problem hiding this comment. We should really only be generating the autoscaling spec in the NginxProxy resource if it's enabled. Similarly, |
||
| {{- if .Values.nginx.pod }} | ||
| pod: | ||
| {{- toYaml .Values.nginx.pod | nindent 8 }} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As mentioned in the overall review comment, please remove this for now and regenerate the CRDs