github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #132115 from liangyuanpeng/drop-ptr-wrappers-pkg-apps

Browse Source 
pkg/appis/apps: use utils/ptr package instead of utils/pointer
This commit is contained in:
Kubernetes Prow Robot
2025-07-03 14:43:25 -07:00
committed by GitHub
parent de74ab716e 258961cb35
commit 8947e2fae0
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/apis/apps/v1/conversion_test.go
View File

@@ -27,11 +27,11 @@ import (
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/apps"
api "k8s.io/kubernetes/pkg/apis/core"
utilpointer "k8s.io/utils/pointer"
"k8s.io/utils/ptr"
)
func TestV12StatefulSetSpecConversion(t *testing.T) {
replicas := utilpointer.Int32(2)
replicas := ptr.To(int32(2))
selector := &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}
appsv1Template := v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Name: "foo"},
@@ -177,7 +177,7 @@ func TestV1StatefulSetStatusConversion(t *testing.T) {
}
func TestV1StatefulSetUpdateStrategyConversion(t *testing.T) {
partition := utilpointer.Int32(2)
partition := ptr.To(int32(2))
appsv1rollingUpdate := new(appsv1.RollingUpdateStatefulSetStrategy)
appsv1rollingUpdate.Partition = partition
appsrollingUpdate := new(apps.RollingUpdateStatefulSetStrategy)
@@ -259,7 +259,7 @@ func TestV1RollingUpdateDaemonSetConversion(t *testing.T) {
}
func TestV1DeploymentConversion(t *testing.T) {
replica := utilpointer.Int32(2)
replica := ptr.To(int32(2))
rollbackTo := new(apps.RollbackConfig)
rollbackTo.Revision = int64(2)
testcases := map[string]struct {
@@ -338,9 +338,9 @@ func TestV1DeploymentConversion(t *testing.T) {
}
func TestV1DeploymentSpecConversion(t *testing.T) {
replica := utilpointer.Int32(2)
revisionHistoryLimit := utilpointer.Int32(2)
progressDeadlineSeconds := utilpointer.Int32(2)
replica := ptr.To(int32(2))
revisionHistoryLimit := ptr.To(int32(2))
progressDeadlineSeconds := ptr.To(int32(2))
testcases := map[string]struct {
deploymentSpec1 *apps.DeploymentSpec

14
pkg/apis/apps/v1beta2/conversion_test.go
View File

@@ -26,14 +26,14 @@ import (
"k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/autoscaling"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/utils/ptr"
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilpointer "k8s.io/utils/pointer"
)
func TestV1beta2StatefulSetSpecConversion(t *testing.T) {
replicas := utilpointer.Int32(2)
replicas := ptr.To(int32(2))
selector := &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}
v1beta2Template := v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Name: "foo"},
@@ -104,7 +104,7 @@ func TestV1beta2StatefulSetSpecConversion(t *testing.T) {
}
func TestV1beta2StatefulSetUpdateStrategyConversion(t *testing.T) {
partition := utilpointer.Int32(2)
partition := ptr.To(int32(2))
v1beta2rollingUpdate := new(v1beta2.RollingUpdateStatefulSetStrategy)
v1beta2rollingUpdate.Partition = partition
appsrollingUpdate := new(apps.RollingUpdateStatefulSetStrategy)
@@ -261,7 +261,7 @@ func TestV1beta2StatefulSetStatusConversion(t *testing.T) {
}
func TestV1beta2DeploymentConversion(t *testing.T) {
replica := utilpointer.Int32(2)
replica := ptr.To(int32(2))
rollbackTo := new(apps.RollbackConfig)
rollbackTo.Revision = int64(2)
testcases := map[string]struct {
@@ -391,9 +391,9 @@ func TestV1beta2ScaleStatusConversion(t *testing.T) {
}
func TestV1beta2DeploymentSpecConversion(t *testing.T) {
replica := utilpointer.Int32(2)
revisionHistoryLimit := utilpointer.Int32(2)
progressDeadlineSeconds := utilpointer.Int32(2)
replica := ptr.To(int32(2))
revisionHistoryLimit := ptr.To(int32(2))
progressDeadlineSeconds := ptr.To(int32(2))
testcases := map[string]struct {
deploymentSpec1 *apps.DeploymentSpec