File tree Expand file tree Collapse file tree 4 files changed +13
-14
lines changed
charts/nginx-gateway-fabric
internal/controller/status Expand file tree Collapse file tree 4 files changed +13
-14
lines changed Original file line number Diff line number Diff line change 22apiVersion : {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
33kind : HorizontalPodAutoscaler
44metadata :
5- {{- with .Values.autoscaling.annotations }}
5+ {{- with .Values.nginxGateway. autoscaling.annotations }}
66 annotations : {{ toYaml . | nindent 4 }}
77 {{- end }}
88 labels :
@@ -17,18 +17,18 @@ spec:
1717 apiVersion : apps/v1
1818 kind : Deployment
1919 name : {{ include "nginx-gateway.fullname" . }}
20- minReplicas : {{ .Values.autoscaling.minReplicas }}
21- maxReplicas : {{ .Values.autoscaling.maxReplicas }}
20+ minReplicas : {{ .Values.nginxGateway. autoscaling.minReplicas }}
21+ maxReplicas : {{ .Values.nginxGateway. autoscaling.maxReplicas }}
2222 metrics :
23- {{- with .Values.autoscaling.targetMemoryUtilizationPercentage }}
23+ {{- with .Values.nginxGateway. autoscaling.targetMemoryUtilizationPercentage }}
2424 - type : Resource
2525 resource :
2626 name : memory
2727 target :
2828 type : Utilization
2929 averageUtilization : {{ . }}
3030 {{- end }}
31- {{- with .Values.autoscaling.targetCPUUtilizationPercentage }}
31+ {{- with .Values.nginxGateway. autoscaling.targetCPUUtilizationPercentage }}
3232 - type : Resource
3333 resource :
3434 name : cpu
3939 {{- with .Values.autoscalingTemplate }}
4040 {{- toYaml . | nindent 2 }}
4141 {{- end }}
42- {{- with .Values.autoscaling.behavior }}
42+ {{- with .Values.nginxGateway. autoscaling.behavior }}
4343 behavior :
4444 {{- toYaml . | nindent 4 }}
4545 {{- end }}
Original file line number Diff line number Diff line change @@ -157,6 +157,7 @@ nginxGateway:
157157 topologySpreadConstraints : []
158158
159159 autoscaling :
160+ # Enable or disable Horizontal Pod Autoscaler
160161 enabled : false
161162 annotations : {}
162163 minReplicas : 1
@@ -252,8 +253,6 @@ nginx:
252253 # plane will copy these secrets into any namespace where NGINX is deployed.
253254 imagePullSecrets : []
254255
255- resources : {}
256-
257256 # Configuration for NGINX Plus usage reporting.
258257 usage :
259258 # -- The name of the Secret containing the JWT for NGINX Plus usage reporting. Must exist in the same namespace
Original file line number Diff line number Diff line change @@ -103,11 +103,11 @@ func removeDuplicateIndexParentRefs(parentRefs []graph.ParentRef) []graph.Parent
103103 idxToParentRef [ref .Idx ] = append (idxToParentRef [ref .Idx ], ref )
104104 }
105105
106- results := make ([]graph.ParentRef , len (idxToParentRef ))
106+ results := make ([]graph.ParentRef , 0 , len (idxToParentRef ))
107107
108108 for idx , refs := range idxToParentRef {
109109 if len (refs ) == 1 {
110- results [ idx ] = refs [0 ]
110+ results = append ( results , refs [0 ])
111111 continue
112112 }
113113
@@ -124,7 +124,7 @@ func removeDuplicateIndexParentRefs(parentRefs []graph.ParentRef) []graph.Parent
124124 }
125125 }
126126 }
127- results [ idx ] = winningParentRef
127+ results = append ( results , winningParentRef )
128128 }
129129
130130 return results
Original file line number Diff line number Diff line change @@ -445,7 +445,7 @@ func TestBuildHTTPRouteStatuses(t *testing.T) {
445445
446446 err := k8sClient .Get (context .Background (), nsname , & hr )
447447 g .Expect (err ).ToNot (HaveOccurred ())
448- g .Expect (helpers . Diff ( expected , hr . Status )) .To (BeEmpty ( ))
448+ g .Expect (expected . RouteStatus . Parents ) .To (ConsistOf ( hr . Status . Parents ))
449449 }
450450}
451451
@@ -524,7 +524,7 @@ func TestBuildGRPCRouteStatuses(t *testing.T) {
524524
525525 err := k8sClient .Get (context .Background (), nsname , & hr )
526526 g .Expect (err ).ToNot (HaveOccurred ())
527- g .Expect (helpers . Diff ( expected , hr . Status )) .To (BeEmpty ( ))
527+ g .Expect (expected . RouteStatus . Parents ) .To (ConsistOf ( hr . Status . Parents ))
528528 }
529529}
530530
@@ -601,7 +601,7 @@ func TestBuildTLSRouteStatuses(t *testing.T) {
601601
602602 err := k8sClient .Get (context .Background (), nsname , & hr )
603603 g .Expect (err ).ToNot (HaveOccurred ())
604- g .Expect (helpers . Diff ( expected , hr . Status )) .To (BeEmpty ( ))
604+ g .Expect (expected . RouteStatus . Parents ) .To (ConsistOf ( hr . Status . Parents ))
605605 }
606606}
607607
You can’t perform that action at this time.
0 commit comments