Properly initialize HPA objects with defaults

Signed-off-by: Arjun Naik <arjun@arjunnaik.in>
kubernetes · Dec 9, 2019 · 8b159e8 · 8b159e8
1 parent fd8ca5d
commit 8b159e8
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 0 deletions.
diff --git a/pkg/api/testing/defaulting_test.go b/pkg/api/testing/defaulting_test.go
@@ -79,6 +79,8 @@ func TestDefaulting(t *testing.T) {
 		{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscalerList"}:                {},
 		{Group: "autoscaling", Version: "v2beta1", Kind: "HorizontalPodAutoscaler"}:               {},
 		{Group: "autoscaling", Version: "v2beta1", Kind: "HorizontalPodAutoscalerList"}:           {},
+		{Group: "autoscaling", Version: "v2beta2", Kind: "HorizontalPodAutoscaler"}:               {},
+		{Group: "autoscaling", Version: "v2beta2", Kind: "HorizontalPodAutoscalerList"}:           {},
 		{Group: "batch", Version: "v1", Kind: "Job"}:                                              {},
 		{Group: "batch", Version: "v1", Kind: "JobList"}:                                          {},
 		{Group: "batch", Version: "v1beta1", Kind: "CronJob"}:                                     {},

diff --git a/pkg/apis/autoscaling/fuzzer/fuzzer.go b/pkg/apis/autoscaling/fuzzer/fuzzer.go
@@ -90,6 +90,43 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
 					},
 				},
 			}
+			stabilizationWindow := int32(c.RandUint64())
+			maxPolicy := autoscaling.MaxPolicySelect
+			minPolicy := autoscaling.MinPolicySelect
+			s.Behavior = &autoscaling.HorizontalPodAutoscalerBehavior{
+				ScaleUp: &autoscaling.HPAScalingRules{
+					StabilizationWindowSeconds: &stabilizationWindow,
+					SelectPolicy:               &maxPolicy,
+					Policies: []autoscaling.HPAScalingPolicy{
+						{
+							Type:          autoscaling.PodsScalingPolicy,
+							Value:         int32(c.RandUint64()),
+							PeriodSeconds: int32(c.RandUint64()),
+						},
+						{
+							Type:          autoscaling.PercentScalingPolicy,
+							Value:         int32(c.RandUint64()),
+							PeriodSeconds: int32(c.RandUint64()),
+						},
+					},
+				},
+				ScaleDown: &autoscaling.HPAScalingRules{
+					StabilizationWindowSeconds: &stabilizationWindow,
+					SelectPolicy:               &minPolicy,
+					Policies: []autoscaling.HPAScalingPolicy{
+						{
+							Type:          autoscaling.PodsScalingPolicy,
+							Value:         int32(c.RandUint64()),
+							PeriodSeconds: int32(c.RandUint64()),
+						},
+						{
+							Type:          autoscaling.PercentScalingPolicy,
+							Value:         int32(c.RandUint64()),
+							PeriodSeconds: int32(c.RandUint64()),
+						},
+					},
+				},
+			}
 		},
 		func(s *autoscaling.HorizontalPodAutoscalerStatus, c fuzz.Continue) {
 			c.FuzzNoCustom(s) // fuzz self without calling this function again

diff --git a/pkg/apis/autoscaling/v2beta2/doc.go b/pkg/apis/autoscaling/v2beta2/doc.go
@@ -17,5 +17,6 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
 // +k8s:conversion-gen-external-types=k8s.io/api/autoscaling/v2beta2
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/autoscaling/v2beta2
 
 package v2beta2 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta2"
diff --git a/pkg/apis/autoscaling/v2beta2/zz_generated.defaults.go b/pkg/apis/autoscaling/v2beta2/zz_generated.defaults.go