Changes to be more consistent about import aliases and group/kind

This commit is contained in:
Sean Sullivan
2018-09-26 13:42:25 -07:00
parent 49852289de
commit 4e8e2705b0
10 changed files with 154 additions and 164 deletions

View File

@@ -21,10 +21,10 @@ import (
"testing"
"time"
apps "k8s.io/api/apps/v1"
batch "k8s.io/api/batch/v1"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -151,9 +151,9 @@ func TestLogsForObject(t *testing.T) {
},
{
name: "replica set logs",
obj: &extensions.ReplicaSet{
obj: &extensionsv1beta1.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{Name: "hello", Namespace: "test"},
Spec: extensions.ReplicaSetSpec{
Spec: extensionsv1beta1.ReplicaSetSpec{
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
},
},
@@ -165,9 +165,9 @@ func TestLogsForObject(t *testing.T) {
},
{
name: "deployment logs",
obj: &extensions.Deployment{
obj: &extensionsv1beta1.Deployment{
ObjectMeta: metav1.ObjectMeta{Name: "hello", Namespace: "test"},
Spec: extensions.DeploymentSpec{
Spec: extensionsv1beta1.DeploymentSpec{
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
},
},
@@ -179,9 +179,9 @@ func TestLogsForObject(t *testing.T) {
},
{
name: "job logs",
obj: &batch.Job{
obj: &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{Name: "hello", Namespace: "test"},
Spec: batch.JobSpec{
Spec: batchv1.JobSpec{
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
},
},
@@ -193,9 +193,9 @@ func TestLogsForObject(t *testing.T) {
},
{
name: "stateful set logs",
obj: &apps.StatefulSet{
obj: &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{Name: "hello", Namespace: "test"},
Spec: apps.StatefulSetSpec{
Spec: appsv1.StatefulSetSpec{
Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}},
},
},