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: 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

60
pkg/kubectl/rolling_updater_test.go
View File

@@ -44,7 +44,7 @@ import (
func oldRc(replicas int, original int) *api.ReplicationController {
return &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo-v1",
UID: "7764ae47-9092-11e4-8393-42010af018ff",
@@ -56,7 +56,7 @@ func oldRc(replicas int, original int) *api.ReplicationController {
Replicas: int32(replicas),
Selector: map[string]string{"version": "v1"},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "foo-v1",
Labels: map[string]string{"version": "v1"},
},
@@ -71,13 +71,13 @@ func oldRc(replicas int, original int) *api.ReplicationController {
func newRc(replicas int, desired int) *api.ReplicationController {
rc := oldRc(replicas, replicas)
rc.Spec.Template = &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "foo-v2",
Labels: map[string]string{"version": "v2"},
},
}
rc.Spec.Selector = map[string]string{"version": "v2"}
rc.ObjectMeta = api.ObjectMeta{
rc.ObjectMeta = metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo-v2",
Annotations: map[string]string{
@@ -948,7 +948,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
}{
{
oldRc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -957,7 +957,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
"dk": "old",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "old",
},
@@ -978,7 +978,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
},
},
newRc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -987,7 +987,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
"dk": "old",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "old",
},
@@ -1013,7 +1013,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
},
{
oldRc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "bar",
},
@@ -1022,7 +1022,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
"dk": "old",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "old",
},
@@ -1039,7 +1039,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
},
},
newRc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "bar",
},
@@ -1048,7 +1048,7 @@ func TestRollingUpdater_multipleContainersInPod(t *testing.T) {
"dk": "old",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "old",
},
@@ -1228,7 +1228,7 @@ func TestRollingUpdater_cleanupWithClients_Rename(t *testing.T) {
func TestFindSourceController(t *testing.T) {
ctrl1 := api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
Annotations: map[string]string{
@@ -1237,7 +1237,7 @@ func TestFindSourceController(t *testing.T) {
},
}
ctrl2 := api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "bar",
Annotations: map[string]string{
@@ -1246,7 +1246,7 @@ func TestFindSourceController(t *testing.T) {
},
}
ctrl3 := api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "baz",
Annotations: map[string]string{
@@ -1328,7 +1328,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
}{
{
rc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
@@ -1341,7 +1341,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
deploymentValue: "some-hash",
expectedRc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
Annotations: map[string]string{
@@ -1353,7 +1353,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
"dk": "some-hash",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "some-hash",
},
@@ -1364,13 +1364,13 @@ func TestUpdateExistingReplicationController(t *testing.T) {
},
{
rc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
},
Spec: api.ReplicationControllerSpec{
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "some-other-hash",
},
@@ -1386,7 +1386,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
deploymentValue: "some-hash",
expectedRc: &api.ReplicationController{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: "foo",
Annotations: map[string]string{
@@ -1398,7 +1398,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
"dk": "some-other-hash",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"dk": "some-other-hash",
},
@@ -1427,7 +1427,7 @@ func TestUpdateExistingReplicationController(t *testing.T) {
func TestUpdateRcWithRetries(t *testing.T) {
codec := testapi.Default.Codec()
rc := &api.ReplicationController{
ObjectMeta: api.ObjectMeta{Name: "rc",
ObjectMeta: metav1.ObjectMeta{Name: "rc",
Labels: map[string]string{
"foo": "bar",
},
@@ -1437,7 +1437,7 @@ func TestUpdateRcWithRetries(t *testing.T) {
"foo": "bar",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"foo": "bar",
},
@@ -1532,13 +1532,13 @@ func TestAddDeploymentHash(t *testing.T) {
buf := &bytes.Buffer{}
codec := testapi.Default.Codec()
rc := &api.ReplicationController{
ObjectMeta: api.ObjectMeta{Name: "rc"},
ObjectMeta: metav1.ObjectMeta{Name: "rc"},
Spec: api.ReplicationControllerSpec{
Selector: map[string]string{
"foo": "bar",
},
Template: &api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"foo": "bar",
},
@@ -1549,9 +1549,9 @@ func TestAddDeploymentHash(t *testing.T) {
podList := &api.PodList{
Items: []api.Pod{
{ObjectMeta: api.ObjectMeta{Name: "foo"}},
{ObjectMeta: api.ObjectMeta{Name: "bar"}},
{ObjectMeta: api.ObjectMeta{Name: "baz"}},
{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
{ObjectMeta: metav1.ObjectMeta{Name: "bar"}},
{ObjectMeta: metav1.ObjectMeta{Name: "baz"}},
},
}
@@ -1624,7 +1624,7 @@ func TestRollingUpdater_readyPods(t *testing.T) {
status = api.ConditionFalse
}
return &api.Pod{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Namespace: api.NamespaceDefault,
Name: fmt.Sprintf("pod-%d", count),
Labels: labels,