Revert "Multi-port Endpoints"

cmd/integration/integration.go

@@ -538,7 +538,7 @@ func runServiceTest(client *client.Client) {
 				{
 					Name:  "c1",
 					Image: "foo",
-					Ports: []api.ContainerPort{
+					Ports: []api.Port{
 						{ContainerPort: 1234},
 					},
 					ImagePullPolicy: "PullIfNotPresent",

pkg/api/testing/fuzzer.go

@@ -24,8 +24,6 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta2"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
@@ -240,13 +238,7 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 		func(ep *api.Endpoint, c fuzz.Continue) {
 			// TODO: If our API used a particular type for IP fields we could just catch that here.
 			ep.IP = fmt.Sprintf("%d.%d.%d.%d", c.Rand.Intn(256), c.Rand.Intn(256), c.Rand.Intn(256), c.Rand.Intn(256))
-			// TODO: Once we drop single-port APIs, make this fuzz
-			// multiple ports and fuzz port.name.  This will force
-			// a compile error when those APIs are deleted.
-			_ = v1beta1.Dependency
-			_ = v1beta2.Dependency
-			ep.Ports = []api.EndpointPort{{Name: "", Port: c.Rand.Intn(65536)}}
-			c.Fuzz(&ep.Ports[0].Protocol)
+			ep.Port = c.Rand.Intn(65536)
 		},
 	)
 	return f

pkg/api/types.go

@@ -239,8 +239,8 @@ type SecretVolumeSource struct {
 	Target ObjectReference `json:"target"`
 }
 
-// ContainerPort represents a network port in a single container
-type ContainerPort struct {
+// Port represents a network port in a single container
+type Port struct {
 	// Optional: If specified, this must be a DNS_LABEL.  Each named port
 	// in a pod must have a unique name.
 	Name string `json:"name,omitempty"`
@@ -346,9 +346,9 @@ type Container struct {
 	// Optional: Defaults to whatever is defined in the image.
 	Command []string `json:"command,omitempty"`
 	// Optional: Defaults to Docker's default.
-	WorkingDir string          `json:"workingDir,omitempty"`
-	Ports      []ContainerPort `json:"ports,omitempty"`
-	Env        []EnvVar        `json:"env,omitempty"`
+	WorkingDir string   `json:"workingDir,omitempty"`
+	Ports      []Port   `json:"ports,omitempty"`
+	Env        []EnvVar `json:"env,omitempty"`
 	// Compute resource requirements.
 	Resources      ResourceRequirements `json:"resources,omitempty"`
 	VolumeMounts   []VolumeMount        `json:"volumeMounts,omitempty"`
@@ -750,6 +750,9 @@ type Endpoints struct {
 	TypeMeta   `json:",inline"`
 	ObjectMeta `json:"metadata,omitempty"`
 
+	// Optional: The IP protocol for these endpoints. Supports "TCP" and
+	// "UDP".  Defaults to "TCP".
+	Protocol  Protocol   `json:"protocol,omitempty"`
 	Endpoints []Endpoint `json:"endpoints,omitempty"`
 }
 
@@ -759,21 +762,8 @@ type Endpoint struct {
 	// TODO: This should allow hostname or IP, see #4447.
 	IP string `json:"ip"`
 
-	// The ports exposed on this IP.
-	Ports []EndpointPort
-}
-
-type EndpointPort struct {
-	// Optional if only one port is defined in this Endpoint.
-	// The name of this port within the larger service/endpoint structure.
-	// This must be a DNS_LABEL.
-	Name string
-
-	// The IP protocol for this port.  Supports "TCP" and "UDP".
-	Protocol Protocol
-
-	// The destination port to access.
-	Port int
+	// Required: The destination port to access.
+	Port int `json:"port"`
 }
 
 // EndpointsList is a list of endpoints.

pkg/api/v1beta1/conversion.go

@@ -1123,16 +1123,12 @@ func init() {
 			if err := s.Convert(&in.ObjectMeta, &out.TypeMeta, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Protocol, &out.Protocol, 0); err != nil {
+				return err
+			}
 			for i := range in.Endpoints {
 				ep := &in.Endpoints[i]
-				// newer.Endpoints.Endpoints[i].Ports is an array - take the first one.
-				if len(ep.Ports) > 0 {
-					port := &ep.Ports[0]
-					if err := s.Convert(&port.Protocol, &out.Protocol, 0); err != nil {
-						return err
-					}
-					out.Endpoints = append(out.Endpoints, net.JoinHostPort(ep.IP, strconv.Itoa(port.Port)))
-				}
+				out.Endpoints = append(out.Endpoints, net.JoinHostPort(ep.IP, strconv.Itoa(ep.Port)))
 			}
 			return nil
 		},
@@ -1143,20 +1139,22 @@ func init() {
 			if err := s.Convert(&in.TypeMeta, &out.ObjectMeta, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Protocol, &out.Protocol, 0); err != nil {
+				return err
+			}
 			for i := range in.Endpoints {
+				out.Endpoints = append(out.Endpoints, newer.Endpoint{})
+				ep := &out.Endpoints[i]
 				host, port, err := net.SplitHostPort(in.Endpoints[i])
 				if err != nil {
 					return err
 				}
+				ep.IP = host
 				pn, err := strconv.Atoi(port)
 				if err != nil {
 					return err
 				}
-				epp := newer.EndpointPort{Port: pn}
-				if err := s.Convert(&in.Protocol, &epp.Protocol, 0); err != nil {
-					return err
-				}
-				out.Endpoints = append(out.Endpoints, newer.Endpoint{IP: host, Ports: []newer.EndpointPort{epp}})
+				ep.Port = pn
 			}
 			return nil
 		},

pkg/api/v1beta1/conversion_test.go

@@ -390,35 +390,41 @@ func TestEndpointsConversion(t *testing.T) {
 	}{
 		{
 			given: current.Endpoints{
-				Protocol:  "",
+				TypeMeta: current.TypeMeta{
+					ID: "empty",
+				},
+				Protocol:  current.ProtocolTCP,
 				Endpoints: []string{},
 			},
 			expected: newer.Endpoints{
+				Protocol:  newer.ProtocolTCP,
 				Endpoints: []newer.Endpoint{},
 			},
 		},
 		{
 			given: current.Endpoints{
+				TypeMeta: current.TypeMeta{
+					ID: "one",
+				},
 				Protocol:  current.ProtocolTCP,
 				Endpoints: []string{"1.2.3.4:88"},
 			},
 			expected: newer.Endpoints{
-				Endpoints: []newer.Endpoint{
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolTCP, Port: 88}}},
-				},
+				Protocol:  newer.ProtocolTCP,
+				Endpoints: []newer.Endpoint{{IP: "1.2.3.4", Port: 88}},
 			},
 		},
 		{
 			given: current.Endpoints{
+				TypeMeta: current.TypeMeta{
+					ID: "several",
+				},
 				Protocol:  current.ProtocolUDP,
 				Endpoints: []string{"1.2.3.4:88", "1.2.3.4:89", "1.2.3.4:90"},
 			},
 			expected: newer.Endpoints{
-				Endpoints: []newer.Endpoint{
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolUDP, Port: 88}}},
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolUDP, Port: 89}}},
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolUDP, Port: 90}}},
-				},
+				Protocol:  newer.ProtocolUDP,
+				Endpoints: []newer.Endpoint{{IP: "1.2.3.4", Port: 88}, {IP: "1.2.3.4", Port: 89}, {IP: "1.2.3.4", Port: 90}},
 			},
 		},
 	}
@@ -430,7 +436,7 @@ func TestEndpointsConversion(t *testing.T) {
 			t.Errorf("[Case: %d] Unexpected error: %v", i, err)
 			continue
 		}
-		if !newer.Semantic.DeepEqual(got.Endpoints, tc.expected.Endpoints) {
+		if got.Protocol != tc.expected.Protocol || !newer.Semantic.DeepEqual(got.Endpoints, tc.expected.Endpoints) {
 			t.Errorf("[Case: %d] Expected %v, got %v", i, tc.expected, got)
 		}
 

pkg/api/v1beta1/defaults.go

@@ -32,7 +32,7 @@ func init() {
 				}
 			}
 		},
-		func(obj *ContainerPort) {
+		func(obj *Port) {
 			if obj.Protocol == "" {
 				obj.Protocol = ProtocolTCP
 			}
@@ -86,7 +86,7 @@ func init() {
 			}
 		},
 		func(obj *Endpoints) {
-			if obj.Protocol == "" && len(obj.Endpoints) > 0 {
+			if obj.Protocol == "" {
 				obj.Protocol = "TCP"
 			}
 		},

pkg/api/v1beta1/defaults_test.go

@@ -73,7 +73,7 @@ func TestSetDefaulPodSpec(t *testing.T) {
 func TestSetDefaultContainer(t *testing.T) {
 	bp := &current.BoundPod{}
 	bp.Spec.Containers = []current.Container{{}}
-	bp.Spec.Containers[0].Ports = []current.ContainerPort{{}}
+	bp.Spec.Containers[0].Ports = []current.Port{{}}
 
 	obj2 := roundTrip(t, runtime.Object(bp))
 	bp2 := obj2.(*current.BoundPod)
@@ -103,18 +103,8 @@ func TestSetDefaultSecret(t *testing.T) {
 	}
 }
 
-func TestSetDefaulEndpointsProtocolEmpty(t *testing.T) {
-	in := &current.Endpoints{}
-	obj := roundTrip(t, runtime.Object(in))
-	out := obj.(*current.Endpoints)
-
-	if out.Protocol != "" {
-		t.Errorf("Expected protocol \"\", got %s", out.Protocol)
-	}
-}
-
 func TestSetDefaulEndpointsProtocol(t *testing.T) {
-	in := &current.Endpoints{Endpoints: []string{"1.2.3.4:5678"}}
+	in := &current.Endpoints{}
 	obj := roundTrip(t, runtime.Object(in))
 	out := obj.(*current.Endpoints)
 

pkg/api/v1beta1/register.go

@@ -24,12 +24,6 @@ import (
 // Codec encodes internal objects to the v1beta1 scheme
 var Codec = runtime.CodecFor(api.Scheme, "v1beta1")
 
-// Dependency does nothing but give a hook for other packages to force a
-// compile-time error when this API version is eventually removed.  This is
-// useful, for example, to clean up things that are implicitly tied to
-// semantics of older APIs.
-const Dependency = true
-
 func init() {
 	api.Scheme.AddKnownTypes("v1beta1",
 		&Pod{},

pkg/api/v1beta1/types.go

@@ -161,8 +161,8 @@ type SecretVolumeSource struct {
 	Target ObjectReference `json:"target" description:"target is a reference to a secret"`
 }
 
-// ContainerPort represents a network port in a single container
-type ContainerPort struct {
+// Port represents a network port in a single container
+type Port struct {
 	// Optional: If specified, this must be a DNS_LABEL.  Each named port
 	// in a pod must have a unique name.
 	Name string `json:"name,omitempty" description:"name for the port that can be referred to by services; must be a DNS_LABEL and unique without the pod"`
@@ -283,7 +283,7 @@ type Container struct {
 	Command []string `json:"command,omitempty" description:"command argv array; not executed within a shell; defaults to entrypoint or command in the image"`
 	// Optional: Defaults to Docker's default.
 	WorkingDir string               `json:"workingDir,omitempty" description:"container's working directory; defaults to image's default"`
-	Ports      []ContainerPort      `json:"ports,omitempty" description:"list of ports to expose from the container"`
+	Ports      []Port               `json:"ports,omitempty" description:"list of ports to expose from the container"`
 	Env        []EnvVar             `json:"env,omitempty" description:"list of environment variables to set in the container"`
 	Resources  ResourceRequirements `json:"resources,omitempty" description:"Compute Resources required by this container"`
 	// Optional: Defaults to unlimited.

pkg/api/v1beta2/conversion.go

@@ -1038,16 +1038,12 @@ func init() {
 			if err := s.Convert(&in.ObjectMeta, &out.TypeMeta, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Protocol, &out.Protocol, 0); err != nil {
+				return err
+			}
 			for i := range in.Endpoints {
 				ep := &in.Endpoints[i]
-				// newer.Endpoints.Endpoints[i].Ports is an array - take the first one.
-				if len(ep.Ports) > 0 {
-					port := &ep.Ports[0]
-					if err := s.Convert(&port.Protocol, &out.Protocol, 0); err != nil {
-						return err
-					}
-					out.Endpoints = append(out.Endpoints, net.JoinHostPort(ep.IP, strconv.Itoa(port.Port)))
-				}
+				out.Endpoints = append(out.Endpoints, net.JoinHostPort(ep.IP, strconv.Itoa(ep.Port)))
 			}
 			return nil
 		},
@@ -1058,20 +1054,22 @@ func init() {
 			if err := s.Convert(&in.TypeMeta, &out.ObjectMeta, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Protocol, &out.Protocol, 0); err != nil {
+				return err
+			}
 			for i := range in.Endpoints {
+				out.Endpoints = append(out.Endpoints, newer.Endpoint{})
+				ep := &out.Endpoints[i]
 				host, port, err := net.SplitHostPort(in.Endpoints[i])
 				if err != nil {
 					return err
 				}
+				ep.IP = host
 				pn, err := strconv.Atoi(port)
 				if err != nil {
 					return err
 				}
-				epp := newer.EndpointPort{Port: pn}
-				if err := s.Convert(&in.Protocol, &epp.Protocol, 0); err != nil {
-					return err
-				}
-				out.Endpoints = append(out.Endpoints, newer.Endpoint{IP: host, Ports: []newer.EndpointPort{epp}})
+				ep.Port = pn
 			}
 			return nil
 		},

pkg/api/v1beta2/conversion_test.go

@@ -220,35 +220,41 @@ func TestEndpointsConversion(t *testing.T) {
 	}{
 		{
 			given: current.Endpoints{
-				Protocol:  "",
+				TypeMeta: current.TypeMeta{
+					ID: "empty",
+				},
+				Protocol:  current.ProtocolTCP,
 				Endpoints: []string{},
 			},
 			expected: newer.Endpoints{
+				Protocol:  newer.ProtocolTCP,
 				Endpoints: []newer.Endpoint{},
 			},
 		},
 		{
 			given: current.Endpoints{
+				TypeMeta: current.TypeMeta{
+					ID: "one",
+				},
 				Protocol:  current.ProtocolTCP,
 				Endpoints: []string{"1.2.3.4:88"},
 			},
 			expected: newer.Endpoints{
-				Endpoints: []newer.Endpoint{
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolTCP, Port: 88}}},
-				},
+				Protocol:  newer.ProtocolTCP,
+				Endpoints: []newer.Endpoint{{IP: "1.2.3.4", Port: 88}},
 			},
 		},
 		{
 			given: current.Endpoints{
+				TypeMeta: current.TypeMeta{
+					ID: "several",
+				},
 				Protocol:  current.ProtocolUDP,
 				Endpoints: []string{"1.2.3.4:88", "1.2.3.4:89", "1.2.3.4:90"},
 			},
 			expected: newer.Endpoints{
-				Endpoints: []newer.Endpoint{
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolUDP, Port: 88}}},
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolUDP, Port: 89}}},
-					{IP: "1.2.3.4", Ports: []newer.EndpointPort{{Protocol: newer.ProtocolUDP, Port: 90}}},
-				},
+				Protocol:  newer.ProtocolUDP,
+				Endpoints: []newer.Endpoint{{IP: "1.2.3.4", Port: 88}, {IP: "1.2.3.4", Port: 89}, {IP: "1.2.3.4", Port: 90}},
 			},
 		},
 	}
@@ -260,7 +266,7 @@ func TestEndpointsConversion(t *testing.T) {
 			t.Errorf("[Case: %d] Unexpected error: %v", i, err)
 			continue
 		}
-		if !newer.Semantic.DeepEqual(got.Endpoints, tc.expected.Endpoints) {
+		if got.Protocol != tc.expected.Protocol || !newer.Semantic.DeepEqual(got.Endpoints, tc.expected.Endpoints) {
 			t.Errorf("[Case: %d] Expected %v, got %v", i, tc.expected, got)
 		}