Code Review

Author: nowjean

apis/v1alpha2/nginxproxy_types.go

@@ -449,17 +449,8 @@ type HPASpec struct {
 	// +optional
 	TargetMemoryUtilizationPercentage *int32 `json:"targetMemoryUtilizationPercentage,omitempty"`
 
-	// Annotation for Horizontal Pod Autoscaler
-	// Annotations is an unstructured key value map stored with a resource that may be
-	// set by external tools to store and retrieve arbitrary metadata. They are not
-	// queryable and should be preserved when modifying objects.
-	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-	//
-	// +optional
-	HPAAnnotations map[string]string `json:"hpaAnnotations,omitempty"`
-
 	// Minimum number of replicas.
-	MinReplicas int32 `json:"minReplicas"`
+	MinReplicas *int32 `json:"minReplicas"`
 
 	// Maximum number of replicas.
 	MaxReplicas int32 `json:"maxReplicas"`

apis/v1alpha2/zz_generated.deepcopy.go

@@ -18,10 +18,6 @@ spec:
       {{- if .Values.nginx.autoscaling.enabled }}
       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 }}
         {{- if .Values.nginx.autoscaling.targetCPUUtilizationPercentage }}

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

@@ -234,7 +234,6 @@ nginx:
   autoscaling:
     # Enable or disable Horizontal Pod Autoscaler
     enabled: false
-    # hpaAnnotations: {}
     # minReplicas: 1
     # maxReplicas: 11
     # targetCPUUtilizationPercentage: 50

charts/nginx-gateway-fabric/values.yaml

@@ -4101,16 +4101,6 @@ spec:
                           enabled:
                             description: Enable or disable Horizontal Pod Autoscaler
                             type: boolean
-                          hpaAnnotations:
-                            additionalProperties:
-                              type: string
-                            description: |-
-                              Annotation for Horizontal Pod Autoscaler
-                              Annotations is an unstructured key value map stored with a resource that may be
-                              set by external tools to store and retrieve arbitrary metadata. They are not
-                              queryable and should be preserved when modifying objects.
-                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                            type: object
                           maxReplicas:
                             description: Maximum number of replicas.
                             format: int32

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

@@ -4686,16 +4686,6 @@ spec:
                           enabled:
                             description: Enable or disable Horizontal Pod Autoscaler
                             type: boolean
-                          hpaAnnotations:
-                            additionalProperties:
-                              type: string
-                            description: |-
-                              Annotation for Horizontal Pod Autoscaler
-                              Annotations is an unstructured key value map stored with a resource that may be
-                              set by external tools to store and retrieve arbitrary metadata. They are not
-                              queryable and should be preserved when modifying objects.
-                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                            type: object
                           maxReplicas:
                             description: Maximum number of replicas.
                             format: int32

deploy/crds.yaml

@@ -81,7 +81,6 @@ func newEventLoop(
 					k8spredicate.And(
 						k8spredicate.GenerationChangedPredicate{},
 						nginxResourceLabelPredicate,
-						predicate.RestartDeploymentAnnotationPredicate{},
 					),
 				),
 			},

internal/controller/provisioner/eventloop.go

@@ -943,8 +943,6 @@ func buildNginxDeploymentHPA(
 	objectMeta metav1.ObjectMeta,
 	autoScaling ngfAPIv1alpha2.HPASpec,
 ) *autoscalingv2.HorizontalPodAutoscaler {
-	objectMeta.Annotations = autoScaling.HPAAnnotations
-
 	if !autoScaling.Enabled {
 		return nil
 	}
@@ -1002,7 +1000,7 @@ func buildNginxDeploymentHPA(
 				Kind:       "Deployment",
 				Name:       objectMeta.Name,
 			},
-			MinReplicas: &autoScaling.MinReplicas,
+			MinReplicas: autoScaling.MinReplicas,
 			MaxReplicas: autoScaling.MaxReplicas,
 			Metrics:     metrics,
 			Behavior:    autoScaling.Behavior,

internal/controller/provisioner/objects.go

@@ -282,7 +282,7 @@ func TestBuildNginxResourceObjects_NginxProxyConfig(t *testing.T) {
 				Replicas: helpers.GetPointer[int32](3),
 				Autoscaling: ngfAPIv1alpha2.HPASpec{
 					Enabled:                           true,
-					MinReplicas:                       1,
+					MinReplicas:                       helpers.GetPointer[int32](1),
 					MaxReplicas:                       5,
 					TargetMemoryUtilizationPercentage: helpers.GetPointer[int32](60),
 				},