refactor: move ListOptions references to metav1

This commit is contained in:
Clayton Coleman
2017-01-21 22:36:02 -05:00
parent 245b592fac
commit 469df12038
364 changed files with 1519 additions and 1554 deletions

View File

@@ -68,7 +68,7 @@ func TestReplicationControllerScaleRetry(t *testing.T) {
preconditions := ScalePrecondition{-1, ""}
count := uint(3)
name := "foo-v1"
namespace := api.NamespaceDefault
namespace := metav1.NamespaceDefault
scaleFunc := ScaleCondition(&scaler, &preconditions, namespace, name, count, nil)
pass, err := scaleFunc()
@@ -127,7 +127,7 @@ func TestReplicationControllerScale(t *testing.T) {
func TestReplicationControllerScaleFailsPreconditions(t *testing.T) {
fake := fake.NewSimpleClientset(&api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{Namespace: api.NamespaceDefault, Name: "foo"},
ObjectMeta: metav1.ObjectMeta{Namespace: metav1.NamespaceDefault, Name: "foo"},
Spec: api.ReplicationControllerSpec{
Replicas: 10,
},
@@ -328,7 +328,7 @@ func TestJobScaleRetry(t *testing.T) {
func job() *batch.Job {
return &batch.Job{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
}
@@ -377,7 +377,7 @@ func TestJobScaleFailsPreconditions(t *testing.T) {
ten := int32(10)
fake := fake.NewSimpleClientset(&batch.Job{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
Spec: batch.JobSpec{
@@ -590,7 +590,7 @@ func TestDeploymentScaleRetry(t *testing.T) {
func deployment() *extensions.Deployment {
return &extensions.Deployment{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
}
@@ -638,7 +638,7 @@ func TestDeploymentScaleInvalid(t *testing.T) {
func TestDeploymentScaleFailsPreconditions(t *testing.T) {
fake := fake.NewSimpleClientset(&extensions.Deployment{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
Spec: extensions.DeploymentSpec{