Skip to content

K
k3s
Unverified Commit 7c67e4d7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60011 from justaugustus/use-utils-int32-ptr

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Use `Int32Ptr` function from utils instead of self-written versions **What this PR does / why we need it**: Replaces instances of newInt{,32} with `Int32Ptr` function from `k8s.io/kubernetes/pkg/util/pointer` **Which issue(s) this PR fixes**: Fixes #59971 **Release note**: ```release-note NONE ```
parents 205ec1e9 036a9ba9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 218 deletions
pkg/apis/apps/v1/BUILD
View file @ 7c67e4d7
...@@ -41,6 +41,7 @@ go_test( ...@@ -41,6 +41,7 @@ go_test(
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/apps/v1:go_default_library", "//vendor/k8s.io/api/apps/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/apis/apps/v1/conversion_test.go
View file @ 7c67e4d7
...@@ -28,10 +28,11 @@ import ( ...@@ -28,10 +28,11 @@ import (
"k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/apps"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestV12StatefulSetSpecConversion(t *testing.T) { func TestV12StatefulSetSpecConversion(t *testing.T) {
replicas := newInt32(2) replicas := utilpointer.Int32Ptr(2)
selector := &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}} selector := &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}
appsv1Template := v1.PodTemplateSpec{ appsv1Template := v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Name: "foo"}, ObjectMeta: metav1.ObjectMeta{Name: "foo"},
...@@ -177,7 +178,7 @@ func TestV1StatefulSetStatusConversion(t *testing.T) { ...@@ -177,7 +178,7 @@ func TestV1StatefulSetStatusConversion(t *testing.T) {
} }
func TestV1StatefulSetUpdateStrategyConversion(t *testing.T) { func TestV1StatefulSetUpdateStrategyConversion(t *testing.T) {
partition := newInt32(2) partition := utilpointer.Int32Ptr(2)
appsv1rollingUpdate := new(appsv1.RollingUpdateStatefulSetStrategy) appsv1rollingUpdate := new(appsv1.RollingUpdateStatefulSetStrategy)
appsv1rollingUpdate.Partition = partition appsv1rollingUpdate.Partition = partition
appsrollingUpdate := new(apps.RollingUpdateStatefulSetStrategy) appsrollingUpdate := new(apps.RollingUpdateStatefulSetStrategy)
...@@ -258,7 +259,7 @@ func TestV1RollingUpdateDaemonSetConversion(t *testing.T) { ...@@ -258,7 +259,7 @@ func TestV1RollingUpdateDaemonSetConversion(t *testing.T) {
} }
func TestV1DeploymentConversion(t *testing.T) { func TestV1DeploymentConversion(t *testing.T) {
replica := newInt32(2) replica := utilpointer.Int32Ptr(2)
rollbackTo := new(extensions.RollbackConfig) rollbackTo := new(extensions.RollbackConfig)
rollbackTo.Revision = int64(2) rollbackTo.Revision = int64(2)
testcases := map[string]struct { testcases := map[string]struct {
...@@ -337,9 +338,9 @@ func TestV1DeploymentConversion(t *testing.T) { ...@@ -337,9 +338,9 @@ func TestV1DeploymentConversion(t *testing.T) {
} }
func TestV1DeploymentSpecConversion(t *testing.T) { func TestV1DeploymentSpecConversion(t *testing.T) {
replica := newInt32(2) replica := utilpointer.Int32Ptr(2)
revisionHistoryLimit := newInt32(2) revisionHistoryLimit := utilpointer.Int32Ptr(2)
progressDeadlineSeconds := newInt32(2) progressDeadlineSeconds := utilpointer.Int32Ptr(2)
testcases := map[string]struct { testcases := map[string]struct {
deploymentSpec1 *extensions.DeploymentSpec deploymentSpec1 *extensions.DeploymentSpec
......
pkg/apis/apps/v1/defaults_test.go
View file @ 7c67e4d7
...@@ -32,6 +32,7 @@ import ( ...@@ -32,6 +32,7 @@ import (
. "k8s.io/kubernetes/pkg/apis/apps/v1" . "k8s.io/kubernetes/pkg/apis/apps/v1"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultDaemonSetSpec(t *testing.T) { func TestSetDefaultDaemonSetSpec(t *testing.T) {
...@@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
}, },
Spec: appsv1.DaemonSetSpec{ Spec: appsv1.DaemonSetSpec{
Template: defaultTemplate, Template: defaultTemplate,
RevisionHistoryLimit: newInt32(1), RevisionHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
expected: &appsv1.DaemonSet{ expected: &appsv1.DaemonSet{
...@@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
}, },
RevisionHistoryLimit: newInt32(1), RevisionHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
}, },
...@@ -130,7 +131,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -130,7 +131,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
UpdateStrategy: appsv1.DaemonSetUpdateStrategy{ UpdateStrategy: appsv1.DaemonSetUpdateStrategy{
Type: appsv1.OnDeleteDaemonSetStrategyType, Type: appsv1.OnDeleteDaemonSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -147,7 +148,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -147,7 +148,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -211,7 +212,7 @@ func TestSetDefaultStatefulSet(t *testing.T) { ...@@ -211,7 +212,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
Partition: &defaultPartition, Partition: &defaultPartition,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -235,7 +236,7 @@ func TestSetDefaultStatefulSet(t *testing.T) { ...@@ -235,7 +236,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
UpdateStrategy: appsv1.StatefulSetUpdateStrategy{ UpdateStrategy: appsv1.StatefulSetUpdateStrategy{
Type: appsv1.OnDeleteStatefulSetStrategyType, Type: appsv1.OnDeleteStatefulSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -260,7 +261,7 @@ func TestSetDefaultStatefulSet(t *testing.T) { ...@@ -260,7 +261,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
Partition: &defaultPartition, Partition: &defaultPartition,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -302,7 +303,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -302,7 +303,7 @@ func TestSetDefaultDeployment(t *testing.T) {
original: &appsv1.Deployment{}, original: &appsv1.Deployment{},
expected: &appsv1.Deployment{ expected: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(1), Replicas: utilpointer.Int32Ptr(1),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RollingUpdateDeploymentStrategyType, Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{ RollingUpdate: &appsv1.RollingUpdateDeployment{
...@@ -310,8 +311,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -310,8 +311,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -319,7 +320,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -319,7 +320,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1.Deployment{ original: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
RollingUpdate: &appsv1.RollingUpdateDeployment{ RollingUpdate: &appsv1.RollingUpdateDeployment{
MaxSurge: &differentIntOrString, MaxSurge: &differentIntOrString,
...@@ -329,7 +330,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -329,7 +330,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &appsv1.Deployment{ expected: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RollingUpdateDeploymentStrategyType, Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{ RollingUpdate: &appsv1.RollingUpdateDeployment{
...@@ -337,8 +338,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -337,8 +338,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -346,7 +347,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -346,7 +347,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1.Deployment{ original: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RollingUpdateDeploymentStrategyType, Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: nil, RollingUpdate: nil,
...@@ -355,7 +356,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -355,7 +356,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &appsv1.Deployment{ expected: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RollingUpdateDeploymentStrategyType, Type: appsv1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1.RollingUpdateDeployment{ RollingUpdate: &appsv1.RollingUpdateDeployment{
...@@ -363,8 +364,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -363,8 +364,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -372,21 +373,21 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -372,21 +373,21 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1.Deployment{ original: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RecreateDeploymentStrategyType, Type: appsv1.RecreateDeploymentStrategyType,
}, },
RevisionHistoryLimit: newInt32(0), RevisionHistoryLimit: utilpointer.Int32Ptr(0),
}, },
}, },
expected: &appsv1.Deployment{ expected: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RecreateDeploymentStrategyType, Type: appsv1.RecreateDeploymentStrategyType,
}, },
RevisionHistoryLimit: newInt32(0), RevisionHistoryLimit: utilpointer.Int32Ptr(0),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -394,22 +395,22 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -394,22 +395,22 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1.Deployment{ original: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RecreateDeploymentStrategyType, Type: appsv1.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
}, },
}, },
expected: &appsv1.Deployment{ expected: &appsv1.Deployment{
Spec: appsv1.DeploymentSpec{ Spec: appsv1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1.DeploymentStrategy{ Strategy: appsv1.DeploymentStrategy{
Type: appsv1.RecreateDeploymentStrategyType, Type: appsv1.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -466,7 +467,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) { ...@@ -466,7 +467,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
{ {
rs: appsv1.ReplicaSet{ rs: appsv1.ReplicaSet{
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Replicas: newInt32(0), Replicas: utilpointer.Int32Ptr(0),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -481,7 +482,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) { ...@@ -481,7 +482,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
{ {
rs: appsv1.ReplicaSet{ rs: appsv1.ReplicaSet{
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -524,7 +525,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) { ...@@ -524,7 +525,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) {
} }
rs := &appsv1.ReplicaSet{ rs := &appsv1.ReplicaSet{
Spec: appsv1.ReplicaSetSpec{ Spec: appsv1.ReplicaSetSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -563,9 +564,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -563,9 +564,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/apps/v1beta1/BUILD
View file @ 7c67e4d7
...@@ -56,6 +56,7 @@ go_test( ...@@ -56,6 +56,7 @@ go_test(
"//pkg/apis/apps/install:go_default_library", "//pkg/apis/apps/install:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/apis/apps/v1beta1/defaults_test.go
View file @ 7c67e4d7
...@@ -31,6 +31,7 @@ import ( ...@@ -31,6 +31,7 @@ import (
. "k8s.io/kubernetes/pkg/apis/apps/v1beta1" . "k8s.io/kubernetes/pkg/apis/apps/v1beta1"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultDeployment(t *testing.T) { func TestSetDefaultDeployment(t *testing.T) {
...@@ -54,7 +55,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -54,7 +55,7 @@ func TestSetDefaultDeployment(t *testing.T) {
original: &appsv1beta1.Deployment{}, original: &appsv1beta1.Deployment{},
expected: &appsv1beta1.Deployment{ expected: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(1), Replicas: utilpointer.Int32Ptr(1),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RollingUpdateDeploymentStrategyType, Type: appsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1beta1.RollingUpdateDeployment{ RollingUpdate: &appsv1beta1.RollingUpdateDeployment{
...@@ -62,8 +63,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -62,8 +63,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -71,7 +72,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -71,7 +72,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta1.Deployment{ original: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
RollingUpdate: &appsv1beta1.RollingUpdateDeployment{ RollingUpdate: &appsv1beta1.RollingUpdateDeployment{
MaxSurge: &differentIntOrString, MaxSurge: &differentIntOrString,
...@@ -81,7 +82,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -81,7 +82,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &appsv1beta1.Deployment{ expected: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RollingUpdateDeploymentStrategyType, Type: appsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1beta1.RollingUpdateDeployment{ RollingUpdate: &appsv1beta1.RollingUpdateDeployment{
...@@ -89,8 +90,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -89,8 +90,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -98,7 +99,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -98,7 +99,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta1.Deployment{ original: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RollingUpdateDeploymentStrategyType, Type: appsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: nil, RollingUpdate: nil,
...@@ -107,7 +108,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -107,7 +108,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &appsv1beta1.Deployment{ expected: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RollingUpdateDeploymentStrategyType, Type: appsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1beta1.RollingUpdateDeployment{ RollingUpdate: &appsv1beta1.RollingUpdateDeployment{
...@@ -115,8 +116,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -115,8 +116,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -124,21 +125,21 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -124,21 +125,21 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta1.Deployment{ original: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RecreateDeploymentStrategyType, Type: appsv1beta1.RecreateDeploymentStrategyType,
}, },
RevisionHistoryLimit: newInt32(0), RevisionHistoryLimit: utilpointer.Int32Ptr(0),
}, },
}, },
expected: &appsv1beta1.Deployment{ expected: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RecreateDeploymentStrategyType, Type: appsv1beta1.RecreateDeploymentStrategyType,
}, },
RevisionHistoryLimit: newInt32(0), RevisionHistoryLimit: utilpointer.Int32Ptr(0),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -146,22 +147,22 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -146,22 +147,22 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta1.Deployment{ original: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RecreateDeploymentStrategyType, Type: appsv1beta1.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
}, },
}, },
expected: &appsv1beta1.Deployment{ expected: &appsv1beta1.Deployment{
Spec: appsv1beta1.DeploymentSpec{ Spec: appsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta1.DeploymentStrategy{ Strategy: appsv1beta1.DeploymentStrategy{
Type: appsv1beta1.RecreateDeploymentStrategyType, Type: appsv1beta1.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -215,9 +216,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -215,9 +216,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/apps/v1beta2/BUILD
View file @ 7c67e4d7
...@@ -62,6 +62,7 @@ go_test( ...@@ -62,6 +62,7 @@ go_test(
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library", "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/apis/apps/v1beta2/conversion_test.go
View file @ 7c67e4d7
...@@ -30,10 +30,11 @@ import ( ...@@ -30,10 +30,11 @@ import (
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestV1beta2StatefulSetSpecConversion(t *testing.T) { func TestV1beta2StatefulSetSpecConversion(t *testing.T) {
replicas := newInt32(2) replicas := utilpointer.Int32Ptr(2)
selector := &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}} selector := &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}
v1beta2Template := v1.PodTemplateSpec{ v1beta2Template := v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Name: "foo"}, ObjectMeta: metav1.ObjectMeta{Name: "foo"},
...@@ -104,7 +105,7 @@ func TestV1beta2StatefulSetSpecConversion(t *testing.T) { ...@@ -104,7 +105,7 @@ func TestV1beta2StatefulSetSpecConversion(t *testing.T) {
} }
func TestV1beta2StatefulSetUpdateStrategyConversion(t *testing.T) { func TestV1beta2StatefulSetUpdateStrategyConversion(t *testing.T) {
partition := newInt32(2) partition := utilpointer.Int32Ptr(2)
v1beta2rollingUpdate := new(v1beta2.RollingUpdateStatefulSetStrategy) v1beta2rollingUpdate := new(v1beta2.RollingUpdateStatefulSetStrategy)
v1beta2rollingUpdate.Partition = partition v1beta2rollingUpdate.Partition = partition
appsrollingUpdate := new(apps.RollingUpdateStatefulSetStrategy) appsrollingUpdate := new(apps.RollingUpdateStatefulSetStrategy)
...@@ -260,7 +261,7 @@ func TestV1beta2StatefulSetStatusConversion(t *testing.T) { ...@@ -260,7 +261,7 @@ func TestV1beta2StatefulSetStatusConversion(t *testing.T) {
} }
func TestV1beta2DeploymentConversion(t *testing.T) { func TestV1beta2DeploymentConversion(t *testing.T) {
replica := newInt32(2) replica := utilpointer.Int32Ptr(2)
rollbackTo := new(extensions.RollbackConfig) rollbackTo := new(extensions.RollbackConfig)
rollbackTo.Revision = int64(2) rollbackTo.Revision = int64(2)
testcases := map[string]struct { testcases := map[string]struct {
...@@ -390,9 +391,9 @@ func TestV1beta2ScaleStatusConversion(t *testing.T) { ...@@ -390,9 +391,9 @@ func TestV1beta2ScaleStatusConversion(t *testing.T) {
} }
func TestV1beta2DeploymentSpecConversion(t *testing.T) { func TestV1beta2DeploymentSpecConversion(t *testing.T) {
replica := newInt32(2) replica := utilpointer.Int32Ptr(2)
revisionHistoryLimit := newInt32(2) revisionHistoryLimit := utilpointer.Int32Ptr(2)
progressDeadlineSeconds := newInt32(2) progressDeadlineSeconds := utilpointer.Int32Ptr(2)
testcases := map[string]struct { testcases := map[string]struct {
deploymentSpec1 *extensions.DeploymentSpec deploymentSpec1 *extensions.DeploymentSpec
......
pkg/apis/apps/v1beta2/defaults_test.go
View file @ 7c67e4d7
...@@ -32,6 +32,7 @@ import ( ...@@ -32,6 +32,7 @@ import (
. "k8s.io/kubernetes/pkg/apis/apps/v1beta2" . "k8s.io/kubernetes/pkg/apis/apps/v1beta2"
api "k8s.io/kubernetes/pkg/apis/core" api "k8s.io/kubernetes/pkg/apis/core"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultDaemonSetSpec(t *testing.T) { func TestSetDefaultDaemonSetSpec(t *testing.T) {
...@@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
}, },
Spec: appsv1beta2.DaemonSetSpec{ Spec: appsv1beta2.DaemonSetSpec{
Template: defaultTemplate, Template: defaultTemplate,
RevisionHistoryLimit: newInt32(1), RevisionHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
expected: &appsv1beta2.DaemonSet{ expected: &appsv1beta2.DaemonSet{
...@@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
}, },
RevisionHistoryLimit: newInt32(1), RevisionHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
}, },
...@@ -130,7 +131,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -130,7 +131,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
UpdateStrategy: appsv1beta2.DaemonSetUpdateStrategy{ UpdateStrategy: appsv1beta2.DaemonSetUpdateStrategy{
Type: appsv1beta2.OnDeleteDaemonSetStrategyType, Type: appsv1beta2.OnDeleteDaemonSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -147,7 +148,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -147,7 +148,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -211,7 +212,7 @@ func TestSetDefaultStatefulSet(t *testing.T) { ...@@ -211,7 +212,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
Partition: &defaultPartition, Partition: &defaultPartition,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -235,7 +236,7 @@ func TestSetDefaultStatefulSet(t *testing.T) { ...@@ -235,7 +236,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
UpdateStrategy: appsv1beta2.StatefulSetUpdateStrategy{ UpdateStrategy: appsv1beta2.StatefulSetUpdateStrategy{
Type: appsv1beta2.OnDeleteStatefulSetStrategyType, Type: appsv1beta2.OnDeleteStatefulSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -260,7 +261,7 @@ func TestSetDefaultStatefulSet(t *testing.T) { ...@@ -260,7 +261,7 @@ func TestSetDefaultStatefulSet(t *testing.T) {
Partition: &defaultPartition, Partition: &defaultPartition,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -302,7 +303,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -302,7 +303,7 @@ func TestSetDefaultDeployment(t *testing.T) {
original: &appsv1beta2.Deployment{}, original: &appsv1beta2.Deployment{},
expected: &appsv1beta2.Deployment{ expected: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(1), Replicas: utilpointer.Int32Ptr(1),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RollingUpdateDeploymentStrategyType, Type: appsv1beta2.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1beta2.RollingUpdateDeployment{ RollingUpdate: &appsv1beta2.RollingUpdateDeployment{
...@@ -310,8 +311,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -310,8 +311,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -319,7 +320,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -319,7 +320,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta2.Deployment{ original: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
RollingUpdate: &appsv1beta2.RollingUpdateDeployment{ RollingUpdate: &appsv1beta2.RollingUpdateDeployment{
MaxSurge: &differentIntOrString, MaxSurge: &differentIntOrString,
...@@ -329,7 +330,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -329,7 +330,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &appsv1beta2.Deployment{ expected: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RollingUpdateDeploymentStrategyType, Type: appsv1beta2.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1beta2.RollingUpdateDeployment{ RollingUpdate: &appsv1beta2.RollingUpdateDeployment{
...@@ -337,8 +338,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -337,8 +338,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -346,7 +347,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -346,7 +347,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta2.Deployment{ original: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RollingUpdateDeploymentStrategyType, Type: appsv1beta2.RollingUpdateDeploymentStrategyType,
RollingUpdate: nil, RollingUpdate: nil,
...@@ -355,7 +356,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -355,7 +356,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &appsv1beta2.Deployment{ expected: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RollingUpdateDeploymentStrategyType, Type: appsv1beta2.RollingUpdateDeploymentStrategyType,
RollingUpdate: &appsv1beta2.RollingUpdateDeployment{ RollingUpdate: &appsv1beta2.RollingUpdateDeployment{
...@@ -363,8 +364,8 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -363,8 +364,8 @@ func TestSetDefaultDeployment(t *testing.T) {
MaxUnavailable: &defaultIntOrString, MaxUnavailable: &defaultIntOrString,
}, },
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -372,21 +373,21 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -372,21 +373,21 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta2.Deployment{ original: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RecreateDeploymentStrategyType, Type: appsv1beta2.RecreateDeploymentStrategyType,
}, },
RevisionHistoryLimit: newInt32(0), RevisionHistoryLimit: utilpointer.Int32Ptr(0),
}, },
}, },
expected: &appsv1beta2.Deployment{ expected: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RecreateDeploymentStrategyType, Type: appsv1beta2.RecreateDeploymentStrategyType,
}, },
RevisionHistoryLimit: newInt32(0), RevisionHistoryLimit: utilpointer.Int32Ptr(0),
ProgressDeadlineSeconds: newInt32(600), ProgressDeadlineSeconds: utilpointer.Int32Ptr(600),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -394,22 +395,22 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -394,22 +395,22 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &appsv1beta2.Deployment{ original: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RecreateDeploymentStrategyType, Type: appsv1beta2.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
}, },
}, },
expected: &appsv1beta2.Deployment{ expected: &appsv1beta2.Deployment{
Spec: appsv1beta2.DeploymentSpec{ Spec: appsv1beta2.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: appsv1beta2.DeploymentStrategy{ Strategy: appsv1beta2.DeploymentStrategy{
Type: appsv1beta2.RecreateDeploymentStrategyType, Type: appsv1beta2.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
RevisionHistoryLimit: newInt32(2), RevisionHistoryLimit: utilpointer.Int32Ptr(2),
Template: defaultTemplate, Template: defaultTemplate,
}, },
}, },
...@@ -466,7 +467,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) { ...@@ -466,7 +467,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
{ {
rs: appsv1beta2.ReplicaSet{ rs: appsv1beta2.ReplicaSet{
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Replicas: newInt32(0), Replicas: utilpointer.Int32Ptr(0),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -481,7 +482,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) { ...@@ -481,7 +482,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
{ {
rs: appsv1beta2.ReplicaSet{ rs: appsv1beta2.ReplicaSet{
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -524,7 +525,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) { ...@@ -524,7 +525,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) {
} }
rs := &appsv1beta2.ReplicaSet{ rs := &appsv1beta2.ReplicaSet{
Spec: appsv1beta2.ReplicaSetSpec{ Spec: appsv1beta2.ReplicaSetSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -563,9 +564,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -563,9 +564,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/autoscaling/v1/BUILD
View file @ 7c67e4d7
...@@ -38,6 +38,7 @@ go_test( ...@@ -38,6 +38,7 @@ go_test(
"//pkg/api/legacyscheme:go_default_library", "//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/autoscaling/install:go_default_library", "//pkg/apis/autoscaling/install:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library", "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
], ],
......
pkg/apis/autoscaling/v1/defaults_test.go
View file @ 7c67e4d7
...@@ -27,6 +27,7 @@ import ( ...@@ -27,6 +27,7 @@ import (
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install" _ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
. "k8s.io/kubernetes/pkg/apis/autoscaling/v1" . "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultHPA(t *testing.T) { func TestSetDefaultHPA(t *testing.T) {
...@@ -43,7 +44,7 @@ func TestSetDefaultHPA(t *testing.T) { ...@@ -43,7 +44,7 @@ func TestSetDefaultHPA(t *testing.T) {
{ {
hpa: autoscalingv1.HorizontalPodAutoscaler{ hpa: autoscalingv1.HorizontalPodAutoscaler{
Spec: autoscalingv1.HorizontalPodAutoscalerSpec{ Spec: autoscalingv1.HorizontalPodAutoscalerSpec{
MinReplicas: newInt32(3), MinReplicas: utilpointer.Int32Ptr(3),
}, },
}, },
expectReplicas: 3, expectReplicas: 3,
...@@ -85,9 +86,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -85,9 +86,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/autoscaling/v2beta1/BUILD
View file @ 7c67e4d7
...@@ -51,6 +51,7 @@ go_test( ...@@ -51,6 +51,7 @@ go_test(
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/autoscaling/install:go_default_library", "//pkg/apis/autoscaling/install:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library", "//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/apis/autoscaling/v2beta1/defaults_test.go
View file @ 7c67e4d7
...@@ -29,11 +29,12 @@ import ( ...@@ -29,11 +29,12 @@ import (
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install" _ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
. "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1" . "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultHPA(t *testing.T) { func TestSetDefaultHPA(t *testing.T) {
utilizationDefaultVal := int32(autoscaling.DefaultCPUUtilization) utilizationDefaultVal := int32(autoscaling.DefaultCPUUtilization)
defaultReplicas := newInt32(1) defaultReplicas := utilpointer.Int32Ptr(1)
defaultTemplate := []autoscalingv2beta1.MetricSpec{ defaultTemplate := []autoscalingv2beta1.MetricSpec{
{ {
Type: autoscalingv2beta1.ResourceMetricSourceType, Type: autoscalingv2beta1.ResourceMetricSourceType,
...@@ -64,13 +65,13 @@ func TestSetDefaultHPA(t *testing.T) { ...@@ -64,13 +65,13 @@ func TestSetDefaultHPA(t *testing.T) {
{ // MinReplicas update { // MinReplicas update
original: &autoscalingv2beta1.HorizontalPodAutoscaler{ original: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{ Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: newInt32(3), MinReplicas: utilpointer.Int32Ptr(3),
Metrics: defaultTemplate, Metrics: defaultTemplate,
}, },
}, },
expected: &autoscalingv2beta1.HorizontalPodAutoscaler{ expected: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{ Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: newInt32(3), MinReplicas: utilpointer.Int32Ptr(3),
Metrics: defaultTemplate, Metrics: defaultTemplate,
}, },
}, },
...@@ -123,9 +124,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -123,9 +124,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/autoscaling/validation/BUILD
View file @ 7c67e4d7
...@@ -26,6 +26,7 @@ go_test( ...@@ -26,6 +26,7 @@ go_test(
deps = [ deps = [
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
], ],
......
pkg/apis/batch/v1/BUILD
View file @ 7c67e4d7
...@@ -38,6 +38,7 @@ go_test( ...@@ -38,6 +38,7 @@ go_test(
"//pkg/api/legacyscheme:go_default_library", "//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/batch/install:go_default_library", "//pkg/apis/batch/install:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library", "//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
......
pkg/apis/batch/v1/defaults_test.go
View file @ 7c67e4d7
...@@ -29,6 +29,7 @@ import ( ...@@ -29,6 +29,7 @@ import (
_ "k8s.io/kubernetes/pkg/apis/batch/install" _ "k8s.io/kubernetes/pkg/apis/batch/install"
. "k8s.io/kubernetes/pkg/apis/batch/v1" . "k8s.io/kubernetes/pkg/apis/batch/v1"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultJob(t *testing.T) { func TestSetDefaultJob(t *testing.T) {
...@@ -48,9 +49,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -48,9 +49,9 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(1), Completions: utilpointer.Int32Ptr(1),
Parallelism: newInt32(1), Parallelism: utilpointer.Int32Ptr(1),
BackoffLimit: newInt32(6), BackoffLimit: utilpointer.Int32Ptr(6),
}, },
}, },
expectLabels: true, expectLabels: true,
...@@ -68,16 +69,16 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -68,16 +69,16 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(1), Completions: utilpointer.Int32Ptr(1),
Parallelism: newInt32(1), Parallelism: utilpointer.Int32Ptr(1),
BackoffLimit: newInt32(6), BackoffLimit: utilpointer.Int32Ptr(6),
}, },
}, },
}, },
"WQ: Parallelism explicitly 0 and completions unset -> BackoffLimit is defaulted": { "WQ: Parallelism explicitly 0 and completions unset -> BackoffLimit is defaulted": {
original: &batchv1.Job{ original: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Parallelism: newInt32(0), Parallelism: utilpointer.Int32Ptr(0),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -85,8 +86,8 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -85,8 +86,8 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Parallelism: newInt32(0), Parallelism: utilpointer.Int32Ptr(0),
BackoffLimit: newInt32(6), BackoffLimit: utilpointer.Int32Ptr(6),
}, },
}, },
expectLabels: true, expectLabels: true,
...@@ -94,7 +95,7 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -94,7 +95,7 @@ func TestSetDefaultJob(t *testing.T) {
"WQ: Parallelism explicitly 2 and completions unset -> BackoffLimit is defaulted": { "WQ: Parallelism explicitly 2 and completions unset -> BackoffLimit is defaulted": {
original: &batchv1.Job{ original: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Parallelism: newInt32(2), Parallelism: utilpointer.Int32Ptr(2),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -102,8 +103,8 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -102,8 +103,8 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Parallelism: newInt32(2), Parallelism: utilpointer.Int32Ptr(2),
BackoffLimit: newInt32(6), BackoffLimit: utilpointer.Int32Ptr(6),
}, },
}, },
expectLabels: true, expectLabels: true,
...@@ -111,7 +112,7 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -111,7 +112,7 @@ func TestSetDefaultJob(t *testing.T) {
"Completions explicitly 2 and others unset -> parallelism and BackoffLimit are defaulted": { "Completions explicitly 2 and others unset -> parallelism and BackoffLimit are defaulted": {
original: &batchv1.Job{ original: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(2), Completions: utilpointer.Int32Ptr(2),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -119,9 +120,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -119,9 +120,9 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(2), Completions: utilpointer.Int32Ptr(2),
Parallelism: newInt32(1), Parallelism: utilpointer.Int32Ptr(1),
BackoffLimit: newInt32(6), BackoffLimit: utilpointer.Int32Ptr(6),
}, },
}, },
expectLabels: true, expectLabels: true,
...@@ -129,7 +130,7 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -129,7 +130,7 @@ func TestSetDefaultJob(t *testing.T) {
"BackoffLimit explicitly 5 and others unset -> parallelism and completions are defaulted": { "BackoffLimit explicitly 5 and others unset -> parallelism and completions are defaulted": {
original: &batchv1.Job{ original: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
BackoffLimit: newInt32(5), BackoffLimit: utilpointer.Int32Ptr(5),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -137,9 +138,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -137,9 +138,9 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(1), Completions: utilpointer.Int32Ptr(1),
Parallelism: newInt32(1), Parallelism: utilpointer.Int32Ptr(1),
BackoffLimit: newInt32(5), BackoffLimit: utilpointer.Int32Ptr(5),
}, },
}, },
expectLabels: true, expectLabels: true,
...@@ -147,9 +148,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -147,9 +148,9 @@ func TestSetDefaultJob(t *testing.T) {
"All set -> no change": { "All set -> no change": {
original: &batchv1.Job{ original: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(8), Completions: utilpointer.Int32Ptr(8),
Parallelism: newInt32(9), Parallelism: utilpointer.Int32Ptr(9),
BackoffLimit: newInt32(10), BackoffLimit: utilpointer.Int32Ptr(10),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -157,9 +158,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -157,9 +158,9 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(8), Completions: utilpointer.Int32Ptr(8),
Parallelism: newInt32(9), Parallelism: utilpointer.Int32Ptr(9),
BackoffLimit: newInt32(10), BackoffLimit: utilpointer.Int32Ptr(10),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -170,9 +171,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -170,9 +171,9 @@ func TestSetDefaultJob(t *testing.T) {
"All set, flipped -> no change": { "All set, flipped -> no change": {
original: &batchv1.Job{ original: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(11), Completions: utilpointer.Int32Ptr(11),
Parallelism: newInt32(10), Parallelism: utilpointer.Int32Ptr(10),
BackoffLimit: newInt32(9), BackoffLimit: utilpointer.Int32Ptr(9),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels}, ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
}, },
...@@ -180,9 +181,9 @@ func TestSetDefaultJob(t *testing.T) { ...@@ -180,9 +181,9 @@ func TestSetDefaultJob(t *testing.T) {
}, },
expected: &batchv1.Job{ expected: &batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Completions: newInt32(11), Completions: utilpointer.Int32Ptr(11),
Parallelism: newInt32(10), Parallelism: utilpointer.Int32Ptr(10),
BackoffLimit: newInt32(9), BackoffLimit: utilpointer.Int32Ptr(9),
}, },
}, },
expectLabels: true, expectLabels: true,
...@@ -244,9 +245,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -244,9 +245,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/batch/v1beta1/BUILD
View file @ 7c67e4d7
...@@ -39,6 +39,7 @@ go_test( ...@@ -39,6 +39,7 @@ go_test(
"//pkg/api/legacyscheme:go_default_library", "//pkg/api/legacyscheme:go_default_library",
"//pkg/apis/batch/install:go_default_library", "//pkg/apis/batch/install:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library", "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
], ],
......
pkg/apis/batch/v1beta1/defaults_test.go
View file @ 7c67e4d7
...@@ -27,6 +27,7 @@ import ( ...@@ -27,6 +27,7 @@ import (
_ "k8s.io/kubernetes/pkg/apis/batch/install" _ "k8s.io/kubernetes/pkg/apis/batch/install"
. "k8s.io/kubernetes/pkg/apis/batch/v1beta1" . "k8s.io/kubernetes/pkg/apis/batch/v1beta1"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultCronJob(t *testing.T) { func TestSetDefaultCronJob(t *testing.T) {
...@@ -40,8 +41,8 @@ func TestSetDefaultCronJob(t *testing.T) { ...@@ -40,8 +41,8 @@ func TestSetDefaultCronJob(t *testing.T) {
Spec: batchv1beta1.CronJobSpec{ Spec: batchv1beta1.CronJobSpec{
ConcurrencyPolicy: batchv1beta1.AllowConcurrent, ConcurrencyPolicy: batchv1beta1.AllowConcurrent,
Suspend: newBool(false), Suspend: newBool(false),
SuccessfulJobsHistoryLimit: newInt32(3), SuccessfulJobsHistoryLimit: utilpointer.Int32Ptr(3),
FailedJobsHistoryLimit: newInt32(1), FailedJobsHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
}, },
...@@ -50,16 +51,16 @@ func TestSetDefaultCronJob(t *testing.T) { ...@@ -50,16 +51,16 @@ func TestSetDefaultCronJob(t *testing.T) {
Spec: batchv1beta1.CronJobSpec{ Spec: batchv1beta1.CronJobSpec{
ConcurrencyPolicy: batchv1beta1.ForbidConcurrent, ConcurrencyPolicy: batchv1beta1.ForbidConcurrent,
Suspend: newBool(true), Suspend: newBool(true),
SuccessfulJobsHistoryLimit: newInt32(5), SuccessfulJobsHistoryLimit: utilpointer.Int32Ptr(5),
FailedJobsHistoryLimit: newInt32(5), FailedJobsHistoryLimit: utilpointer.Int32Ptr(5),
}, },
}, },
expected: &batchv1beta1.CronJob{ expected: &batchv1beta1.CronJob{
Spec: batchv1beta1.CronJobSpec{ Spec: batchv1beta1.CronJobSpec{
ConcurrencyPolicy: batchv1beta1.ForbidConcurrent, ConcurrencyPolicy: batchv1beta1.ForbidConcurrent,
Suspend: newBool(true), Suspend: newBool(true),
SuccessfulJobsHistoryLimit: newInt32(5), SuccessfulJobsHistoryLimit: utilpointer.Int32Ptr(5),
FailedJobsHistoryLimit: newInt32(5), FailedJobsHistoryLimit: utilpointer.Int32Ptr(5),
}, },
}, },
}, },
...@@ -114,9 +115,3 @@ func newBool(val bool) *bool { ...@@ -114,9 +115,3 @@ func newBool(val bool) *bool {
*p = val *p = val
return p return p
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
pkg/apis/core/v1/defaults_test.go
View file @ 7c67e4d7
...@@ -29,6 +29,7 @@ import ( ...@@ -29,6 +29,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
corev1 "k8s.io/kubernetes/pkg/apis/core/v1" corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
// enforce that all types are installed // enforce that all types are installed
_ "k8s.io/kubernetes/pkg/api/testapi" _ "k8s.io/kubernetes/pkg/api/testapi"
...@@ -164,12 +165,6 @@ func TestSetDefaultReplicationController(t *testing.T) { ...@@ -164,12 +165,6 @@ func TestSetDefaultReplicationController(t *testing.T) {
} }
} }
func newInt(val int32) *int32 {
p := new(int32)
*p = val
return p
}
func TestSetDefaultReplicationControllerReplicas(t *testing.T) { func TestSetDefaultReplicationControllerReplicas(t *testing.T) {
tests := []struct { tests := []struct {
rc v1.ReplicationController rc v1.ReplicationController
...@@ -192,7 +187,7 @@ func TestSetDefaultReplicationControllerReplicas(t *testing.T) { ...@@ -192,7 +187,7 @@ func TestSetDefaultReplicationControllerReplicas(t *testing.T) {
{ {
rc: v1.ReplicationController{ rc: v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Replicas: newInt(0), Replicas: utilpointer.Int32Ptr(0),
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -207,7 +202,7 @@ func TestSetDefaultReplicationControllerReplicas(t *testing.T) { ...@@ -207,7 +202,7 @@ func TestSetDefaultReplicationControllerReplicas(t *testing.T) {
{ {
rc: v1.ReplicationController{ rc: v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Replicas: newInt(3), Replicas: utilpointer.Int32Ptr(3),
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -1274,7 +1269,7 @@ func TestDefaultRequestIsNotSetForReplicationController(t *testing.T) { ...@@ -1274,7 +1269,7 @@ func TestDefaultRequestIsNotSetForReplicationController(t *testing.T) {
} }
rc := &v1.ReplicationController{ rc := &v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Replicas: newInt(3), Replicas: utilpointer.Int32Ptr(3),
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
......
pkg/apis/extensions/v1beta1/BUILD
View file @ 7c67e4d7
...@@ -43,6 +43,7 @@ go_test( ...@@ -43,6 +43,7 @@ go_test(
"//pkg/apis/core:go_default_library", "//pkg/apis/core:go_default_library",
"//pkg/apis/core/install:go_default_library", "//pkg/apis/core/install:go_default_library",
"//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/install:go_default_library",
"//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
......
pkg/apis/extensions/v1beta1/defaults_test.go
View file @ 7c67e4d7
...@@ -33,6 +33,7 @@ import ( ...@@ -33,6 +33,7 @@ import (
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
_ "k8s.io/kubernetes/pkg/apis/extensions/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install"
. "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" . "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
) )
func TestSetDefaultDaemonSetSpec(t *testing.T) { func TestSetDefaultDaemonSetSpec(t *testing.T) {
...@@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{ UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType, Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
}, },
Spec: extensionsv1beta1.DaemonSetSpec{ Spec: extensionsv1beta1.DaemonSetSpec{
Template: defaultTemplate, Template: defaultTemplate,
RevisionHistoryLimit: newInt32(1), RevisionHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
expected: &extensionsv1beta1.DaemonSet{ expected: &extensionsv1beta1.DaemonSet{
...@@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{ UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType, Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(1), RevisionHistoryLimit: utilpointer.Int32Ptr(1),
}, },
}, },
}, },
...@@ -123,7 +124,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -123,7 +124,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{ UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType, Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -137,7 +138,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) { ...@@ -137,7 +138,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{ UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType, Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
}, },
RevisionHistoryLimit: newInt32(10), RevisionHistoryLimit: utilpointer.Int32Ptr(10),
}, },
}, },
}, },
...@@ -179,7 +180,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -179,7 +180,7 @@ func TestSetDefaultDeployment(t *testing.T) {
original: &extensionsv1beta1.Deployment{}, original: &extensionsv1beta1.Deployment{},
expected: &extensionsv1beta1.Deployment{ expected: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(1), Replicas: utilpointer.Int32Ptr(1),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType, Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{ RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
...@@ -194,7 +195,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -194,7 +195,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &extensionsv1beta1.Deployment{ original: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{ RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
MaxSurge: &differentIntOrString, MaxSurge: &differentIntOrString,
...@@ -204,7 +205,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -204,7 +205,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &extensionsv1beta1.Deployment{ expected: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType, Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{ RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
...@@ -219,7 +220,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -219,7 +220,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &extensionsv1beta1.Deployment{ original: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType, Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: nil, RollingUpdate: nil,
...@@ -228,7 +229,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -228,7 +229,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &extensionsv1beta1.Deployment{ expected: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType, Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{ RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
...@@ -243,7 +244,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -243,7 +244,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &extensionsv1beta1.Deployment{ original: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RecreateDeploymentStrategyType, Type: extensionsv1beta1.RecreateDeploymentStrategyType,
}, },
...@@ -251,7 +252,7 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -251,7 +252,7 @@ func TestSetDefaultDeployment(t *testing.T) {
}, },
expected: &extensionsv1beta1.Deployment{ expected: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RecreateDeploymentStrategyType, Type: extensionsv1beta1.RecreateDeploymentStrategyType,
}, },
...@@ -262,21 +263,21 @@ func TestSetDefaultDeployment(t *testing.T) { ...@@ -262,21 +263,21 @@ func TestSetDefaultDeployment(t *testing.T) {
{ {
original: &extensionsv1beta1.Deployment{ original: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RecreateDeploymentStrategyType, Type: extensionsv1beta1.RecreateDeploymentStrategyType,
}, },
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
}, },
}, },
expected: &extensionsv1beta1.Deployment{ expected: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{ Spec: extensionsv1beta1.DeploymentSpec{
Replicas: newInt32(5), Replicas: utilpointer.Int32Ptr(5),
Strategy: extensionsv1beta1.DeploymentStrategy{ Strategy: extensionsv1beta1.DeploymentStrategy{
Type: extensionsv1beta1.RecreateDeploymentStrategyType, Type: extensionsv1beta1.RecreateDeploymentStrategyType,
}, },
Template: defaultTemplate, Template: defaultTemplate,
ProgressDeadlineSeconds: newInt32(30), ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
}, },
}, },
}, },
...@@ -432,7 +433,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) { ...@@ -432,7 +433,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
{ {
rs: extensionsv1beta1.ReplicaSet{ rs: extensionsv1beta1.ReplicaSet{
Spec: extensionsv1beta1.ReplicaSetSpec{ Spec: extensionsv1beta1.ReplicaSetSpec{
Replicas: newInt32(0), Replicas: utilpointer.Int32Ptr(0),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -447,7 +448,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) { ...@@ -447,7 +448,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
{ {
rs: extensionsv1beta1.ReplicaSet{ rs: extensionsv1beta1.ReplicaSet{
Spec: extensionsv1beta1.ReplicaSetSpec{ Spec: extensionsv1beta1.ReplicaSetSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -490,7 +491,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) { ...@@ -490,7 +491,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) {
} }
rs := &extensionsv1beta1.ReplicaSet{ rs := &extensionsv1beta1.ReplicaSet{
Spec: extensionsv1beta1.ReplicaSetSpec{ Spec: extensionsv1beta1.ReplicaSetSpec{
Replicas: newInt32(3), Replicas: utilpointer.Int32Ptr(3),
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{ Labels: map[string]string{
...@@ -742,9 +743,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { ...@@ -742,9 +743,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
} }
return obj3 return obj3
} }
func newInt32(val int32) *int32 {
p := new(int32)
*p = val
return p
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment