From 66205bb3135200d4b5544447b02bda025c382d88 Mon Sep 17 00:00:00 2001 From: HaoJie Liu Date: Fri, 15 Jul 2022 14:03:59 +0800 Subject: [PATCH] Remove redundant variable definitions in apis/autoscaling Signed-off-by: HaoJie Liu --- pkg/apis/autoscaling/fuzzer/fuzzer.go | 4 ++-- pkg/apis/autoscaling/v1/defaults.go | 4 ++-- pkg/apis/autoscaling/v2/defaults.go | 4 ++-- pkg/apis/autoscaling/v2beta1/defaults.go | 4 ++-- pkg/apis/autoscaling/v2beta2/defaults.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/apis/autoscaling/fuzzer/fuzzer.go b/pkg/apis/autoscaling/fuzzer/fuzzer.go index d8956bb185b..6a9cbc71402 100644 --- a/pkg/apis/autoscaling/fuzzer/fuzzer.go +++ b/pkg/apis/autoscaling/fuzzer/fuzzer.go @@ -24,6 +24,7 @@ import ( runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kubernetes/pkg/apis/autoscaling" api "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/utils/pointer" ) // Funcs returns the fuzzer functions for the autoscaling api group. @@ -40,8 +41,7 @@ var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} { }, func(s *autoscaling.HorizontalPodAutoscalerSpec, c fuzz.Continue) { c.FuzzNoCustom(s) // fuzz self without calling this function again - minReplicas := int32(c.Rand.Int31()) - s.MinReplicas = &minReplicas + s.MinReplicas = pointer.Int32(c.Rand.Int31()) randomQuantity := func() resource.Quantity { var q resource.Quantity diff --git a/pkg/apis/autoscaling/v1/defaults.go b/pkg/apis/autoscaling/v1/defaults.go index 4469ec553bf..e15cb67c30a 100644 --- a/pkg/apis/autoscaling/v1/defaults.go +++ b/pkg/apis/autoscaling/v1/defaults.go @@ -19,6 +19,7 @@ package v1 import ( autoscalingv1 "k8s.io/api/autoscaling/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { @@ -27,8 +28,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv1.HorizontalPodAutoscaler) { if obj.Spec.MinReplicas == nil { - minReplicas := int32(1) - obj.Spec.MinReplicas = &minReplicas + obj.Spec.MinReplicas = pointer.Int32(1) } // NB: we apply a default for CPU utilization in conversion because diff --git a/pkg/apis/autoscaling/v2/defaults.go b/pkg/apis/autoscaling/v2/defaults.go index 29e7c998f46..2ae50ae287d 100644 --- a/pkg/apis/autoscaling/v2/defaults.go +++ b/pkg/apis/autoscaling/v2/defaults.go @@ -21,6 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/autoscaling" + "k8s.io/utils/pointer" ) var ( @@ -69,8 +70,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2.HorizontalPodAutoscaler) { if obj.Spec.MinReplicas == nil { - minReplicas := int32(1) - obj.Spec.MinReplicas = &minReplicas + obj.Spec.MinReplicas = pointer.Int32(1) } if len(obj.Spec.Metrics) == 0 { diff --git a/pkg/apis/autoscaling/v2beta1/defaults.go b/pkg/apis/autoscaling/v2beta1/defaults.go index 5fdf8e7122c..77866da4edf 100644 --- a/pkg/apis/autoscaling/v2beta1/defaults.go +++ b/pkg/apis/autoscaling/v2beta1/defaults.go @@ -21,6 +21,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/autoscaling" + "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { @@ -29,8 +30,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2beta1.HorizontalPodAutoscaler) { if obj.Spec.MinReplicas == nil { - minReplicas := int32(1) - obj.Spec.MinReplicas = &minReplicas + obj.Spec.MinReplicas = pointer.Int32(1) } if len(obj.Spec.Metrics) == 0 { diff --git a/pkg/apis/autoscaling/v2beta2/defaults.go b/pkg/apis/autoscaling/v2beta2/defaults.go index a688bfa6070..c6f60dd4908 100644 --- a/pkg/apis/autoscaling/v2beta2/defaults.go +++ b/pkg/apis/autoscaling/v2beta2/defaults.go @@ -21,6 +21,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubernetes/pkg/apis/autoscaling" + "k8s.io/utils/pointer" ) var ( @@ -70,8 +71,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2beta2.HorizontalPodAutoscaler) { if obj.Spec.MinReplicas == nil { - minReplicas := int32(1) - obj.Spec.MinReplicas = &minReplicas + obj.Spec.MinReplicas = pointer.Int32(1) } if len(obj.Spec.Metrics) == 0 {