github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use metav1.ObjectMeta in other types

Browse Source
This commit is contained in:
Clayton Coleman
2017-01-16 22:38:19 -05:00
parent 5a5d31555b
commit 9a2a50cda7
822 changed files with 11914 additions and 9290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/kubectl/scale_test.go
View File

@@ -127,7 +127,7 @@ func TestReplicationControllerScale(t *testing.T) {
func TestReplicationControllerScaleFailsPreconditions(t *testing.T) {
fake := fake.NewSimpleClientset(&api.ReplicationController{
ObjectMeta: api.ObjectMeta{Namespace: api.NamespaceDefault, Name: "foo"},
ObjectMeta: metav1.ObjectMeta{Namespace: api.NamespaceDefault, Name: "foo"},
Spec: api.ReplicationControllerSpec{
Replicas: 10,
},
@@ -162,7 +162,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{-1, ""},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -175,7 +175,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{0, ""},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -188,7 +188,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{-1, "foo"},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -201,7 +201,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -214,7 +214,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -227,7 +227,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "bar",
},
Spec: api.ReplicationControllerSpec{
@@ -240,7 +240,7 @@ func TestValidateReplicationController(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
controller: api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "bar",
},
Spec: api.ReplicationControllerSpec{
@@ -327,7 +327,7 @@ func TestJobScaleRetry(t *testing.T) {
func job() *batch.Job {
return &batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -376,7 +376,7 @@ func TestJobScaleInvalid(t *testing.T) {
func TestJobScaleFailsPreconditions(t *testing.T) {
ten := int32(10)
fake := fake.NewSimpleClientset(&batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -415,7 +415,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{-1, ""},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: batch.JobSpec{
@@ -428,7 +428,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{0, ""},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: batch.JobSpec{
@@ -441,7 +441,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{-1, "foo"},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: batch.JobSpec{
@@ -454,7 +454,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: batch.JobSpec{
@@ -467,7 +467,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: batch.JobSpec{
@@ -480,7 +480,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
},
@@ -490,7 +490,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "bar",
},
Spec: batch.JobSpec{
@@ -503,7 +503,7 @@ func TestValidateJob(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
job: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "bar",
},
Spec: batch.JobSpec{
@@ -589,7 +589,7 @@ func TestDeploymentScaleRetry(t *testing.T) {
func deployment() *extensions.Deployment {
return &extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -637,7 +637,7 @@ func TestDeploymentScaleInvalid(t *testing.T) {
func TestDeploymentScaleFailsPreconditions(t *testing.T) {
fake := fake.NewSimpleClientset(&extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -676,7 +676,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{-1, ""},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: extensions.DeploymentSpec{
@@ -689,7 +689,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{0, ""},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: extensions.DeploymentSpec{
@@ -702,7 +702,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{-1, "foo"},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: extensions.DeploymentSpec{
@@ -715,7 +715,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: extensions.DeploymentSpec{
@@ -728,7 +728,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
Spec: extensions.DeploymentSpec{
@@ -741,7 +741,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "foo",
},
},
@@ -751,7 +751,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "bar",
},
Spec: extensions.DeploymentSpec{
@@ -764,7 +764,7 @@ func TestValidateDeployment(t *testing.T) {
{
preconditions: ScalePrecondition{10, "foo"},
deployment: extensions.Deployment{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
ResourceVersion: "bar",
},
Spec: extensions.DeploymentSpec{