Add unit test; fix some other issues

Author: sjberman

apis/v1alpha2/nginxproxy_types.go

@@ -431,30 +431,30 @@ const (
 
 // Deployment is the configuration for the NGINX Deployment.
 type DeploymentSpec struct {
-	// Container defines container fields for the NGINX container.
-	//
-	// +optional
-	Container ContainerSpec `json:"container"`
-
 	// Number of desired Pods.
 	//
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
 
-	// Autoscaling defines the configuration for Horizontal Pod Autoscaling.
+	// Pod defines Pod-specific fields.
 	//
 	// +optional
-	Autoscaling HPASpec `json:"autoscaling"`
+	Pod PodSpec `json:"pod"`
 
-	// Pod defines Pod-specific fields.
+	// Container defines container fields for the NGINX container.
 	//
 	// +optional
-	Pod PodSpec `json:"pod"`
+	Container ContainerSpec `json:"container"`
 
 	// Patches are custom patches to apply to the NGINX Deployment.
 	//
 	// +optional
 	Patches []Patch `json:"patches,omitempty"`
+
+	// Autoscaling defines the configuration for Horizontal Pod Autoscaling.
+	//
+	// +optional
+	Autoscaling HPASpec `json:"autoscaling"`
 }
 
 // DaemonSet is the configuration for the NGINX DaemonSet.
@@ -489,11 +489,6 @@ type HPASpec struct {
 	// +optional
 	Behavior *autoscalingv2.HorizontalPodAutoscalerBehavior `json:"behavior,omitempty"`
 
-	// AutoscalingTemplate configures the additional scaling option.
-	//
-	// +optional
-	AutoscalingTemplate []autoscalingv2.MetricSpec `json:"autoscalingTemplate,omitempty"`
-
 	// Target cpu utilization percentage of HPA.
 	//
 	// +optional
@@ -514,11 +509,17 @@ type HPASpec struct {
 	// +kubebuilder:validation:Minimum=1
 	MinReplicas *int32 `json:"minReplicas,omitempty"`
 
+	// AutoscalingTemplate configures the additional scaling option.
+	//
+	// +optional
+	AutoscalingTemplate []autoscalingv2.MetricSpec `json:"autoscalingTemplate,omitempty"`
+
 	// Maximum number of replicas.
+	//
 	// +kubebuilder:validation:Minimum=1
 	MaxReplicas int32 `json:"maxReplicas"`
 
-	// Enable or disable Horizontal Pod Autoscaler
+	// Enable or disable Horizontal Pod Autoscaler.
 	Enabled bool `json:"enabled"`
 }
 

apis/v1alpha2/zz_generated.deepcopy.go

@@ -8,7 +8,7 @@ rules:
 - apiGroups:
   - ""
   - apps
-  {{- if or .Values.nginx.autoscaling.enabled .Values.nginxGateway.autoscaling.enabled }}
+  {{- if .Values.nginx.autoscaling.enabled }}
   - autoscaling
   {{- end }}
   resources:
@@ -18,7 +18,7 @@ rules:
   - services
   - deployments
   - daemonsets
-  {{- if or .Values.nginx.autoscaling.enabled .Values.nginxGateway.autoscaling.enabled }}
+  {{- if .Values.nginx.autoscaling.enabled }}
   - horizontalpodautoscalers
   {{- end }}
   verbs:

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

@@ -4179,7 +4179,7 @@ spec:
                                 type: object
                             type: object
                           enabled:
-                            description: Enable or disable Horizontal Pod Autoscaler
+                            description: Enable or disable Horizontal Pod Autoscaler.
                             type: boolean
                           maxReplicas:
                             description: Maximum number of replicas.

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

@@ -4764,7 +4764,7 @@ spec:
                                 type: object
                             type: object
                           enabled:
-                            description: Enable or disable Horizontal Pod Autoscaler
+                            description: Enable or disable Horizontal Pod Autoscaler.
                             type: boolean
                           maxReplicas:
                             description: Maximum number of replicas.

deploy/crds.yaml

@@ -79,17 +79,6 @@ func newEventLoop(
 				),
 			},
 		},
-		{
-			objectType: &autoscalingv2.HorizontalPodAutoscaler{},
-			options: []controller.Option{
-				controller.WithK8sPredicate(
-					k8spredicate.And(
-						k8spredicate.GenerationChangedPredicate{},
-						nginxResourceLabelPredicate,
-					),
-				),
-			},
-		},
 		{
 			objectType: &appsv1.DaemonSet{},
 			options: []controller.Option{
@@ -148,6 +137,16 @@ func newEventLoop(
 				),
 			},
 		},
+		{
+			objectType: &autoscalingv2.HorizontalPodAutoscaler{},
+			options: []controller.Option{
+				controller.WithK8sPredicate(
+					k8spredicate.And(
+						nginxResourceLabelPredicate,
+					),
+				),
+			},
+		},
 	}
 
 	if isOpenshift {
@@ -201,6 +200,7 @@ func newEventLoop(
 		// to provision or deprovision any nginx resources.
 		&gatewayv1.GatewayList{},
 		&appsv1.DeploymentList{},
+		&appsv1.DaemonSetList{},
 		&autoscalingv2.HorizontalPodAutoscalerList{},
 		&corev1.ServiceList{},
 		&corev1.ServiceAccountList{},

internal/controller/provisioner/eventloop.go

@@ -383,6 +383,82 @@ func TestBuildNginxResourceObjects_NginxProxyConfig(t *testing.T) {
 	g.Expect(hpa.Spec.MaxReplicas).To(Equal(int32(5)))
 }
 
+func TestBuildNginxResourceObjects_DeploymentReplicasFromHPA(t *testing.T) {
+	t.Parallel()
+	g := NewWithT(t)
+
+	// Create a fake HPA with status.desiredReplicas set
+	hpa := &autoscalingv2.HorizontalPodAutoscaler{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "gw-nginx",
+			Namespace: "default",
+		},
+		Status: autoscalingv2.HorizontalPodAutoscalerStatus{
+			DesiredReplicas: 7,
+		},
+	}
+
+	agentTLSSecret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      agentTLSTestSecretName,
+			Namespace: ngfNamespace,
+		},
+		Data: map[string][]byte{"tls.crt": []byte("tls")},
+	}
+
+	fakeClient := fake.NewFakeClient(agentTLSSecret, hpa)
+
+	provisioner := &NginxProvisioner{
+		cfg: Config{
+			GatewayPodConfig: &config.GatewayPodConfig{
+				Namespace: ngfNamespace,
+				Version:   "1.0.0",
+				Image:     "ngf-image",
+			},
+			AgentTLSSecretName: agentTLSTestSecretName,
+		},
+		baseLabelSelector: metav1.LabelSelector{
+			MatchLabels: map[string]string{"app": "nginx"},
+		},
+		k8sClient: fakeClient,
+	}
+
+	gateway := &gatewayv1.Gateway{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "gw",
+			Namespace: "default",
+		},
+		Spec: gatewayv1.GatewaySpec{
+			Listeners: []gatewayv1.Listener{{Port: 80}},
+		},
+	}
+
+	resourceName := "gw-nginx"
+	nProxyCfg := &graph.EffectiveNginxProxy{
+		Kubernetes: &ngfAPIv1alpha2.KubernetesSpec{
+			Deployment: &ngfAPIv1alpha2.DeploymentSpec{
+				Replicas:    nil, // Should be overridden by HPA
+				Autoscaling: ngfAPIv1alpha2.HPASpec{Enabled: true},
+			},
+		},
+	}
+
+	objects, err := provisioner.buildNginxResourceObjects(resourceName, gateway, nProxyCfg)
+	g.Expect(err).ToNot(HaveOccurred())
+
+	// Find the deployment object
+	var deployment *appsv1.Deployment
+	for _, obj := range objects {
+		if d, ok := obj.(*appsv1.Deployment); ok {
+			deployment = d
+			break
+		}
+	}
+	g.Expect(deployment).ToNot(BeNil())
+	g.Expect(deployment.Spec.Replicas).ToNot(BeNil())
+	g.Expect(*deployment.Spec.Replicas).To(Equal(int32(7)))
+}
+
 func TestBuildNginxResourceObjects_Plus(t *testing.T) {
 	t.Parallel()
 	g := NewWithT(t)
@@ -1121,8 +1197,8 @@ func TestBuildNginxResourceObjectsForDeletion_DataplaneKeySecret(t *testing.T) {
 	objects := provisioner.buildNginxResourceObjectsForDeletion(deploymentNSName)
 
 	// Should include the dataplane key secret in the objects list
-	// Default: deployment, daemonset, service, serviceaccount, 2 configmaps, agentTLSSecret, dataplaneKeySecret
-	g.Expect(objects).To(HaveLen(8))
+	// Default: deployment, daemonset, service, hpa, serviceaccount, 2 configmaps, agentTLSSecret, dataplaneKeySecret
+	g.Expect(objects).To(HaveLen(9))
 
 	validateMeta := func(obj client.Object, name string) {
 		g.Expect(obj.GetName()).To(Equal(name))