github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

refactor: move ListOptions references to metav1

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/kubectl/rolling_updater_test.go
View File

@@ -45,7 +45,7 @@ import (
func oldRc(replicas int, original int) *api.ReplicationController {
return &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo-v1",
UID: "7764ae47-9092-11e4-8393-42010af018ff",
Annotations: map[string]string{
@@ -78,7 +78,7 @@ func newRc(replicas int, desired int) *api.ReplicationController {
}
rc.Spec.Selector = map[string]string{"version": "v2"}
rc.ObjectMeta = metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo-v2",
Annotations: map[string]string{
desiredReplicasAnnotation: fmt.Sprintf("%d", desired),
@@ -949,7 +949,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
{
oldRc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -979,7 +979,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
},
newRc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -1014,7 +1014,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
{
oldRc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "bar",
},
Spec: api.ReplicationControllerSpec{
@@ -1040,7 +1040,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
},
newRc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "bar",
},
Spec: api.ReplicationControllerSpec{
@@ -1085,7 +1085,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
test.newRc.Name = fmt.Sprintf("%s-%s", test.newRc.Name, deploymentHash)
config := &NewControllerConfig{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
OldName: test.oldRc.ObjectMeta.Name,
NewName: test.newRc.ObjectMeta.Name,
Image: test.image,
@@ -1229,7 +1229,7 @@ func TestRollingUpdater_cleanupWithClients_Rename(t *testing.T) {
func TestFindSourceController(t *testing.T) {
ctrl1 := api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
Annotations: map[string]string{
sourceIdAnnotation: "bar:1234",
@@ -1238,7 +1238,7 @@ func TestFindSourceController(t *testing.T) {
}
ctrl2 := api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "bar",
Annotations: map[string]string{
sourceIdAnnotation: "foo:12345",
@@ -1247,7 +1247,7 @@ func TestFindSourceController(t *testing.T) {
}
ctrl3 := api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "baz",
Annotations: map[string]string{
sourceIdAnnotation: "baz:45667",
@@ -1329,7 +1329,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
{
rc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -1342,7 +1342,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
expectedRc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
Annotations: map[string]string{
"kubectl.kubernetes.io/next-controller-id": "foo",
@@ -1365,7 +1365,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
{
rc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
},
Spec: api.ReplicationControllerSpec{
@@ -1387,7 +1387,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
expectedRc: &api.ReplicationController{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: "foo",
Annotations: map[string]string{
"kubectl.kubernetes.io/next-controller-id": "foo",
@@ -1597,7 +1597,7 @@ func TestAddDeploymentHash(t *testing.T) {
restClient.Client = fakeClient.Client
clientset := internalclientset.New(restClient)
if _, err := AddDeploymentKeyToReplicationController(rc, clientset.Core(), clientset.Core(), "dk", "hash", api.NamespaceDefault, buf); err != nil {
if _, err := AddDeploymentKeyToReplicationController(rc, clientset.Core(), clientset.Core(), "dk", "hash", metav1.NamespaceDefault, buf); err != nil {
t.Errorf("unexpected error: %v", err)
}
for _, pod := range podList.Items {
@@ -1625,7 +1625,7 @@ func TestRollingUpdater_readyPods(t *testing.T) {
}
return &api.Pod{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
Name: fmt.Sprintf("pod-%d", count),
Labels: labels,
},