Omitempty

Author: sjberman

apis/v1alpha2/nginxproxy_types.go

@@ -436,6 +436,11 @@ type DeploymentSpec struct {
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
 
+	// Autoscaling defines the configuration for Horizontal Pod Autoscaling.
+	//
+	// +optional
+	Autoscaling *HPASpec `json:"autoscaling,omitempty"`
+
 	// Pod defines Pod-specific fields.
 	//
 	// +optional
@@ -450,11 +455,6 @@ type DeploymentSpec struct {
 	//
 	// +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.

apis/v1alpha2/zz_generated.deepcopy.go

@@ -202,7 +202,7 @@ func (p *NginxProvisioner) buildNginxResourceObjects(
 }
 
 func isAutoscalingEnabled(dep *ngfAPIv1alpha2.DeploymentSpec) bool {
-	return dep != nil && dep.Autoscaling.Enabled
+	return dep != nil && dep.Autoscaling != nil && dep.Autoscaling.Enabled
 }
 
 func (p *NginxProvisioner) buildHPA(
@@ -1141,7 +1141,7 @@ func getMetricTargetByType(target autoscalingv2.MetricTarget) autoscalingv2.Metr
 
 func buildNginxDeploymentHPA(
 	objectMeta metav1.ObjectMeta,
-	autoScaling ngfAPIv1alpha2.HPASpec,
+	autoScaling *ngfAPIv1alpha2.HPASpec,
 ) *autoscalingv2.HorizontalPodAutoscaler {
 	if !autoScaling.Enabled {
 		return nil

internal/controller/provisioner/objects.go

@@ -287,7 +287,7 @@ func TestBuildNginxResourceObjects_NginxProxyConfig(t *testing.T) {
 			},
 			Deployment: &ngfAPIv1alpha2.DeploymentSpec{
 				Replicas: helpers.GetPointer[int32](3),
-				Autoscaling: ngfAPIv1alpha2.HPASpec{
+				Autoscaling: &ngfAPIv1alpha2.HPASpec{
 					Enabled:                           true,
 					MinReplicas:                       helpers.GetPointer[int32](1),
 					MaxReplicas:                       5,
@@ -438,7 +438,7 @@ func TestBuildNginxResourceObjects_DeploymentReplicasFromHPA(t *testing.T) {
 		Kubernetes: &ngfAPIv1alpha2.KubernetesSpec{
 			Deployment: &ngfAPIv1alpha2.DeploymentSpec{
 				Replicas:    nil, // Should be overridden by HPA
-				Autoscaling: ngfAPIv1alpha2.HPASpec{Enabled: true},
+				Autoscaling: &ngfAPIv1alpha2.HPASpec{Enabled: true},
 			},
 		},
 	}