From 376b3c4b9ae5a0360fa018bee3c58160a7435353 Mon Sep 17 00:00:00 2001 From: Mayank Kumar Date: Wed, 30 Mar 2022 01:28:41 -0700 Subject: [PATCH] fix some nits from API changes --- pkg/apis/apps/v1/defaults.go | 4 ++-- pkg/apis/apps/v1beta1/defaults.go | 4 ++-- pkg/apis/apps/v1beta2/defaults.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/apis/apps/v1/defaults.go b/pkg/apis/apps/v1/defaults.go index 2a57d78950a..a259bcf8c53 100644 --- a/pkg/apis/apps/v1/defaults.go +++ b/pkg/apis/apps/v1/defaults.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" + "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { @@ -116,8 +117,7 @@ func SetDefaults_StatefulSet(obj *appsv1.StatefulSet) { obj.Spec.UpdateStrategy.RollingUpdate != nil { if obj.Spec.UpdateStrategy.RollingUpdate.Partition == nil { - obj.Spec.UpdateStrategy.RollingUpdate.Partition = new(int32) - *obj.Spec.UpdateStrategy.RollingUpdate.Partition = 0 + obj.Spec.UpdateStrategy.RollingUpdate.Partition = pointer.Int32(0) } if utilfeature.DefaultFeatureGate.Enabled(features.MaxUnavailableStatefulSet) { if obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable == nil { diff --git a/pkg/apis/apps/v1beta1/defaults.go b/pkg/apis/apps/v1beta1/defaults.go index 1378747504e..874ce62eb0e 100644 --- a/pkg/apis/apps/v1beta1/defaults.go +++ b/pkg/apis/apps/v1beta1/defaults.go @@ -23,6 +23,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" + "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { @@ -73,8 +74,7 @@ func SetDefaults_StatefulSet(obj *appsv1beta1.StatefulSet) { obj.Spec.UpdateStrategy.RollingUpdate != nil { if obj.Spec.UpdateStrategy.RollingUpdate.Partition == nil { - obj.Spec.UpdateStrategy.RollingUpdate.Partition = new(int32) - *obj.Spec.UpdateStrategy.RollingUpdate.Partition = 0 + obj.Spec.UpdateStrategy.RollingUpdate.Partition = pointer.Int32(0) } if utilfeature.DefaultFeatureGate.Enabled(features.MaxUnavailableStatefulSet) { if obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable == nil { diff --git a/pkg/apis/apps/v1beta2/defaults.go b/pkg/apis/apps/v1beta2/defaults.go index c2c17863cdf..4f5be48e257 100644 --- a/pkg/apis/apps/v1beta2/defaults.go +++ b/pkg/apis/apps/v1beta2/defaults.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" + "k8s.io/utils/pointer" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { @@ -73,8 +74,7 @@ func SetDefaults_StatefulSet(obj *appsv1beta2.StatefulSet) { obj.Spec.UpdateStrategy.RollingUpdate != nil { if obj.Spec.UpdateStrategy.RollingUpdate.Partition == nil { - obj.Spec.UpdateStrategy.RollingUpdate.Partition = new(int32) - *obj.Spec.UpdateStrategy.RollingUpdate.Partition = 0 + obj.Spec.UpdateStrategy.RollingUpdate.Partition = pointer.Int32(0) } if utilfeature.DefaultFeatureGate.Enabled(features.MaxUnavailableStatefulSet) { if obj.Spec.UpdateStrategy.RollingUpdate.MaxUnavailable == nil {