File tree Expand file tree Collapse file tree 4 files changed +3
-6
lines changed
charts/nginx-gateway-fabric
internal/controller/provisioner Expand file tree Collapse file tree 4 files changed +3
-6
lines changed Original file line number Diff line number Diff line change 1818 {{- if .Values.nginx.autoscaling.enabled }}
1919 autoscaling :
2020 enabled : {{ .Values.nginx.autoscaling.enabled }}
21- {{- if .Values.nginx.autoscaling.hpaAnnotations }}
22- hpaAnnotations :
23- {{- toYaml .Values.nginx.autoscaling.hpaAnnotations | nindent 10 }}
24- {{- end }}
2521 minReplicas : {{ .Values.nginx.autoscaling.minReplicas }}
2622 maxReplicas : {{ .Values.nginx.autoscaling.maxReplicas }}
2723 {{- if .Values.nginx.autoscaling.targetCPUUtilizationPercentage }}
Original file line number Diff line number Diff line change @@ -232,7 +232,6 @@ nginx:
232232 autoscaling :
233233 # Enable or disable Horizontal Pod Autoscaler
234234 enabled : false
235- # hpaAnnotations: {}
236235 # minReplicas: 1
237236 # maxReplicas: 11
238237 # targetCPUUtilizationPercentage: 50
Original file line number Diff line number Diff line change @@ -4181,6 +4181,7 @@ spec:
41814181 description: Enable or disable Horizontal Pod Autoscaler
41824182 type: boolean
41834183<<<<<<< HEAD
4184+ <<<<<<< HEAD
41844185=======
41854186 hpaAnnotations:
41864187 additionalProperties:
@@ -4192,6 +4193,8 @@ spec:
41924193 queryable and should be preserved when modifying objects.
41934194 More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
41944195 type: object
4196+ >>>>>>> Code Review
4197+ =======
41954198>>>>>>> Code Review
41964199 maxReplicas:
41974200 description: Maximum number of replicas.
Original file line number Diff line number Diff line change @@ -81,7 +81,6 @@ func newEventLoop(
8181 k8spredicate .And (
8282 k8spredicate.GenerationChangedPredicate {},
8383 nginxResourceLabelPredicate ,
84- predicate.RestartDeploymentAnnotationPredicate {},
8584 ),
8685 ),
8786 },
You can’t perform that action at this time.
0 commit comments