github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-10 12:04:16 +00:00
Code Issues Projects Releases Wiki Activity

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

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

56
pkg/kubectl/polymorphichelpers/protocolsforobject_test.go
View File

@@ -21,8 +21,8 @@ import (
"reflect"
api "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
)
@@ -32,11 +32,11 @@ func TestProtocolsForObject(t *testing.T) {
expectErr bool
}{
{
object: &api.Pod{
Spec: api.PodSpec{
Containers: []api.Container{
object: &corev1.Pod{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Ports: []api.ContainerPort{
Ports: []corev1.ContainerPort{
{
ContainerPort: 101,
Protocol: "tcp",
@@ -48,9 +48,9 @@ func TestProtocolsForObject(t *testing.T) {
},
},
{
object: &api.Service{
Spec: api.ServiceSpec{
Ports: []api.ServicePort{
object: &corev1.Service{
Spec: corev1.ServiceSpec{
Ports: []corev1.ServicePort{
{
Port: 101,
Protocol: "tcp",
@@ -60,13 +60,13 @@ func TestProtocolsForObject(t *testing.T) {
},
},
{
object: &api.ReplicationController{
Spec: api.ReplicationControllerSpec{
Template: &api.PodTemplateSpec{
Spec: api.PodSpec{
Containers: []api.Container{
object: &corev1.ReplicationController{
Spec: corev1.ReplicationControllerSpec{
Template: &corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Ports: []api.ContainerPort{
Ports: []corev1.ContainerPort{
{
ContainerPort: 101,
Protocol: "tcp",
@@ -80,13 +80,13 @@ func TestProtocolsForObject(t *testing.T) {
},
},
{
object: &extensions.Deployment{
Spec: extensions.DeploymentSpec{
Template: api.PodTemplateSpec{
Spec: api.PodSpec{
Containers: []api.Container{
object: &extensionsv1beta1.Deployment{
Spec: extensionsv1beta1.DeploymentSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Ports: []api.ContainerPort{
Ports: []corev1.ContainerPort{
{
ContainerPort: 101,
Protocol: "tcp",
@@ -100,13 +100,13 @@ func TestProtocolsForObject(t *testing.T) {
},
},
{
object: &extensions.ReplicaSet{
Spec: extensions.ReplicaSetSpec{
Template: api.PodTemplateSpec{
Spec: api.PodSpec{
Containers: []api.Container{
object: &extensionsv1beta1.ReplicaSet{
Spec: extensionsv1beta1.ReplicaSetSpec{
Template: corev1.PodTemplateSpec{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
{
Ports: []api.ContainerPort{
Ports: []corev1.ContainerPort{
{
ContainerPort: 101,
Protocol: "tcp",
@@ -120,7 +120,7 @@ func TestProtocolsForObject(t *testing.T) {
},
},
{
object: &api.Node{},
object: &corev1.Node{},
expectErr: true,
},
}