Skip to content

K
k3s
Commit 1b0bc942 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30301 from girishkalele/endpoint_hostnames

Automatic merge from submit-queue Add NodeName to EndpointAddress object Adding a new string type `nodeName` to api.EndpointAddress. We could also do *ObjectReference to the api.Node object instead, which would be more precise for the future. ``` type ObjectReference struct { Kind string `json:"kind,omitempty"` Namespace string `json:"namespace,omitempty"` Name string `json:"name,omitempty"` UID types.UID `json:"uid,omitempty"` APIVersion string `json:"apiVersion,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` // Optional. If referring to a piece of an object instead of an entire object, this string // should contain information to identify the sub-object. For example, if the object // reference is to a container within a pod, this would take on a value like: // "spec.containers{name}" (where "name" refers to the name of the container that triggered // the event) or if no container name is specified "spec.containers[2]" (container with // index 2 in this pod). This syntax is chosen only to have some well-defined way of // referencing a part of an object. // TODO: this design is not final and this field is subject to change in the future. FieldPath string `json:"fieldPath,omitempty"` } ```
parents a594dcb1 e105525b
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 23 deletions
api/swagger-spec/v1.json
View file @ 1b0bc942
...@@ -16342,6 +16342,10 @@ ...@@ -16342,6 +16342,10 @@
"type": "string", "type": "string",
"description": "The Hostname of this endpoint" "description": "The Hostname of this endpoint"
}, },
"nodeName": {
"type": "string",
"description": "Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node."
},
"targetRef": { "targetRef": {
"$ref": "v1.ObjectReference", "$ref": "v1.ObjectReference",
"description": "Reference to object providing the endpoint." "description": "Reference to object providing the endpoint."
......
docs/api-reference/v1/definitions.html
View file @ 1b0bc942
...@@ -8105,6 +8105,13 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -8105,6 +8105,13 @@ The resulting set of endpoints can be viewed as:<br>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">nodeName</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">targetRef</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">targetRef</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Reference to object providing the endpoint.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Reference to object providing the endpoint.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
...@@ -8160,7 +8167,7 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -8160,7 +8167,7 @@ The resulting set of endpoints can be viewed as:<br>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-08-11 00:53:51 UTC Last updated 2016-08-16 03:52:37 UTC
</div> </div>
</div> </div>
</body> </body>
......
pkg/api/types.generated.go
View file @ 1b0bc942
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/types.go
View file @ 1b0bc942
...@@ -1889,6 +1889,8 @@ type EndpointAddress struct { ...@@ -1889,6 +1889,8 @@ type EndpointAddress struct {
// Optional: Hostname of this endpoint // Optional: Hostname of this endpoint
// Meant to be used by DNS servers etc. // Meant to be used by DNS servers etc.
Hostname string `json:"hostname,omitempty"` Hostname string `json:"hostname,omitempty"`
// Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.
NodeName *string `json:"nodeName,omitempty"`
// Optional: The kubernetes object related to the entry point. // Optional: The kubernetes object related to the entry point.
TargetRef *ObjectReference TargetRef *ObjectReference
} }
......
pkg/api/v1/generated.pb.go
View file @ 1b0bc942
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/v1/generated.proto
View file @ 1b0bc942
...@@ -558,6 +558,9 @@ message EndpointAddress { ...@@ -558,6 +558,9 @@ message EndpointAddress {
// The Hostname of this endpoint // The Hostname of this endpoint
optional string hostname = 3; optional string hostname = 3;
// Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.
optional string nodeName = 4;
// Reference to object providing the endpoint. // Reference to object providing the endpoint.
optional ObjectReference targetRef = 2; optional ObjectReference targetRef = 2;
} }
......
pkg/api/v1/types.generated.go
View file @ 1b0bc942
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/v1/types.go
View file @ 1b0bc942
...@@ -2279,6 +2279,8 @@ type EndpointAddress struct { ...@@ -2279,6 +2279,8 @@ type EndpointAddress struct {
IP string `json:"ip" protobuf:"bytes,1,opt,name=ip"` IP string `json:"ip" protobuf:"bytes,1,opt,name=ip"`
// The Hostname of this endpoint // The Hostname of this endpoint
Hostname string `json:"hostname,omitempty" protobuf:"bytes,3,opt,name=hostname"` Hostname string `json:"hostname,omitempty" protobuf:"bytes,3,opt,name=hostname"`
// Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.
NodeName *string `json:"nodeName,omitempty" protobuf:"bytes,4,opt,name=nodeName"`
// Reference to object providing the endpoint. // Reference to object providing the endpoint.
TargetRef *ObjectReference `json:"targetRef,omitempty" protobuf:"bytes,2,opt,name=targetRef"` TargetRef *ObjectReference `json:"targetRef,omitempty" protobuf:"bytes,2,opt,name=targetRef"`
} }
......
pkg/api/v1/types_swagger_doc_generated.go
View file @ 1b0bc942
...@@ -358,6 +358,7 @@ var map_EndpointAddress = map[string]string{ ...@@ -358,6 +358,7 @@ var map_EndpointAddress = map[string]string{
"": "EndpointAddress is a tuple that describes single IP address.", "": "EndpointAddress is a tuple that describes single IP address.",
"ip": "The IP of this endpoint. May not be loopback (127.0.0.0/8), link-local (169.254.0.0/16), or link-local multicast ((224.0.0.0/24). IPv6 is also accepted but not fully supported on all platforms. Also, certain kubernetes components, like kube-proxy, are not IPv6 ready.", "ip": "The IP of this endpoint. May not be loopback (127.0.0.0/8), link-local (169.254.0.0/16), or link-local multicast ((224.0.0.0/24). IPv6 is also accepted but not fully supported on all platforms. Also, certain kubernetes components, like kube-proxy, are not IPv6 ready.",
"hostname": "The Hostname of this endpoint", "hostname": "The Hostname of this endpoint",
"nodeName": "Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.",
"targetRef": "Reference to object providing the endpoint.", "targetRef": "Reference to object providing the endpoint.",
} }
......
pkg/api/v1/zz_generated.conversion.go
View file @ 1b0bc942
...@@ -1535,6 +1535,7 @@ func Convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *api.EmptyDi ...@@ -1535,6 +1535,7 @@ func Convert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *api.EmptyDi
func autoConvert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out *api.EndpointAddress, s conversion.Scope) error { func autoConvert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out *api.EndpointAddress, s conversion.Scope) error {
out.IP = in.IP out.IP = in.IP
out.Hostname = in.Hostname out.Hostname = in.Hostname
out.NodeName = in.NodeName
if in.TargetRef != nil { if in.TargetRef != nil {
in, out := &in.TargetRef, &out.TargetRef in, out := &in.TargetRef, &out.TargetRef
*out = new(api.ObjectReference) *out = new(api.ObjectReference)
...@@ -1554,6 +1555,7 @@ func Convert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out ...@@ -1554,6 +1555,7 @@ func Convert_v1_EndpointAddress_To_api_EndpointAddress(in *EndpointAddress, out
func autoConvert_api_EndpointAddress_To_v1_EndpointAddress(in *api.EndpointAddress, out *EndpointAddress, s conversion.Scope) error { func autoConvert_api_EndpointAddress_To_v1_EndpointAddress(in *api.EndpointAddress, out *EndpointAddress, s conversion.Scope) error {
out.IP = in.IP out.IP = in.IP
out.Hostname = in.Hostname out.Hostname = in.Hostname
out.NodeName = in.NodeName
if in.TargetRef != nil { if in.TargetRef != nil {
in, out := &in.TargetRef, &out.TargetRef in, out := &in.TargetRef, &out.TargetRef
*out = new(ObjectReference) *out = new(ObjectReference)
......
pkg/api/v1/zz_generated.deepcopy.go
View file @ 1b0bc942
...@@ -792,6 +792,13 @@ func DeepCopy_v1_EndpointAddress(in interface{}, out interface{}, c *conversion. ...@@ -792,6 +792,13 @@ func DeepCopy_v1_EndpointAddress(in interface{}, out interface{}, c *conversion.
out := out.(*EndpointAddress) out := out.(*EndpointAddress)
out.IP = in.IP out.IP = in.IP
out.Hostname = in.Hostname out.Hostname = in.Hostname
if in.NodeName != nil {
in, out := &in.NodeName, &out.NodeName
*out = new(string)
**out = **in
} else {
out.NodeName = nil
}
if in.TargetRef != nil { if in.TargetRef != nil {
in, out := &in.TargetRef, &out.TargetRef in, out := &in.TargetRef, &out.TargetRef
*out = new(ObjectReference) *out = new(ObjectReference)
......
pkg/api/zz_generated.deepcopy.go
View file @ 1b0bc942
...@@ -819,6 +819,13 @@ func DeepCopy_api_EndpointAddress(in interface{}, out interface{}, c *conversion ...@@ -819,6 +819,13 @@ func DeepCopy_api_EndpointAddress(in interface{}, out interface{}, c *conversion
out := out.(*EndpointAddress) out := out.(*EndpointAddress)
out.IP = in.IP out.IP = in.IP
out.Hostname = in.Hostname out.Hostname = in.Hostname
if in.NodeName != nil {
in, out := &in.NodeName, &out.NodeName
*out = new(string)
**out = **in
} else {
out.NodeName = nil
}
if in.TargetRef != nil { if in.TargetRef != nil {
in, out := &in.TargetRef, &out.TargetRef in, out := &in.TargetRef, &out.TargetRef
*out = new(ObjectReference) *out = new(ObjectReference)
......
pkg/controller/endpoint/endpoints_controller.go
View file @ 1b0bc942
...@@ -404,7 +404,8 @@ func (e *EndpointController) syncService(key string) { ...@@ -404,7 +404,8 @@ func (e *EndpointController) syncService(key string) {
epp := api.EndpointPort{Name: portName, Port: int32(portNum), Protocol: portProto} epp := api.EndpointPort{Name: portName, Port: int32(portNum), Protocol: portProto}
epa := api.EndpointAddress{ epa := api.EndpointAddress{
IP: pod.Status.PodIP, IP: pod.Status.PodIP,
NodeName: &pod.Spec.NodeName,
TargetRef: &api.ObjectReference{ TargetRef: &api.ObjectReference{
Kind: "Pod", Kind: "Pod",
Namespace: pod.ObjectMeta.Namespace, Namespace: pod.ObjectMeta.Namespace,
......
pkg/controller/endpoint/endpoints_controller_test.go
View file @ 1b0bc942
...@@ -37,6 +37,7 @@ import ( ...@@ -37,6 +37,7 @@ import (
) )
var alwaysReady = func() bool { return true } var alwaysReady = func() bool { return true }
var emptyNodeName string
func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotReady int) { func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotReady int) {
for i := 0; i < nPods+nNotReady; i++ { for i := 0; i < nPods+nNotReady; i++ {
...@@ -101,7 +102,7 @@ func TestSyncEndpointsItemsPreserveNoSelector(t *testing.T) { ...@@ -101,7 +102,7 @@ func TestSyncEndpointsItemsPreserveNoSelector(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "6.7.8.9"}}, Addresses: []api.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []api.EndpointPort{{Port: 1000}}, Ports: []api.EndpointPort{{Port: 1000}},
}}, }},
}}) }})
...@@ -133,7 +134,7 @@ func TestCheckLeftoverEndpoints(t *testing.T) { ...@@ -133,7 +134,7 @@ func TestCheckLeftoverEndpoints(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "6.7.8.9"}}, Addresses: []api.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []api.EndpointPort{{Port: 1000}}, Ports: []api.EndpointPort{{Port: 1000}},
}}, }},
}}, }},
...@@ -163,7 +164,7 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) { ...@@ -163,7 +164,7 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "6.7.8.9"}}, Addresses: []api.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []api.EndpointPort{{Port: 1000, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 1000, Protocol: "TCP"}},
}}, }},
}}) }})
...@@ -189,7 +190,7 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) { ...@@ -189,7 +190,7 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}) })
...@@ -206,7 +207,7 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) { ...@@ -206,7 +207,7 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "6.7.8.9"}}, Addresses: []api.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []api.EndpointPort{{Port: 1000, Protocol: "UDP"}}, Ports: []api.EndpointPort{{Port: 1000, Protocol: "UDP"}},
}}, }},
}}) }})
...@@ -231,7 +232,7 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) { ...@@ -231,7 +232,7 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "UDP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "UDP"}},
}}, }},
}) })
...@@ -269,7 +270,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) { ...@@ -269,7 +270,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}) })
...@@ -307,7 +308,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllNotReady(t *testing.T) { ...@@ -307,7 +308,7 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllNotReady(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}) })
...@@ -345,8 +346,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllMixed(t *testing.T) { ...@@ -345,8 +346,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllMixed(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.5", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod1", Namespace: ns}}}, NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.5", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod1", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}) })
...@@ -363,7 +364,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) { ...@@ -363,7 +364,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "6.7.8.9"}}, Addresses: []api.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []api.EndpointPort{{Port: 1000}}, Ports: []api.EndpointPort{{Port: 1000}},
}}, }},
}}) }})
...@@ -387,7 +388,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) { ...@@ -387,7 +388,7 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
ResourceVersion: "1", ResourceVersion: "1",
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}) })
...@@ -404,7 +405,7 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) { ...@@ -404,7 +405,7 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) {
Namespace: ns, Namespace: ns,
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}}) }})
...@@ -447,9 +448,9 @@ func TestSyncEndpointsItems(t *testing.T) { ...@@ -447,9 +448,9 @@ func TestSyncEndpointsItems(t *testing.T) {
endpoints.syncService("other/foo") endpoints.syncService("other/foo")
expectedSubsets := []api.EndpointSubset{{ expectedSubsets := []api.EndpointSubset{{
Addresses: []api.EndpointAddress{ Addresses: []api.EndpointAddress{
{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}, {IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}},
{IP: "1.2.3.5", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod1", Namespace: ns}}, {IP: "1.2.3.5", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod1", Namespace: ns}},
{IP: "1.2.3.6", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod2", Namespace: ns}}, {IP: "1.2.3.6", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod2", Namespace: ns}},
}, },
Ports: []api.EndpointPort{ Ports: []api.EndpointPort{
{Name: "port0", Port: 8080, Protocol: "TCP"}, {Name: "port0", Port: 8080, Protocol: "TCP"},
...@@ -494,9 +495,9 @@ func TestSyncEndpointsItemsWithLabels(t *testing.T) { ...@@ -494,9 +495,9 @@ func TestSyncEndpointsItemsWithLabels(t *testing.T) {
endpoints.syncService(ns + "/foo") endpoints.syncService(ns + "/foo")
expectedSubsets := []api.EndpointSubset{{ expectedSubsets := []api.EndpointSubset{{
Addresses: []api.EndpointAddress{ Addresses: []api.EndpointAddress{
{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}, {IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}},
{IP: "1.2.3.5", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod1", Namespace: ns}}, {IP: "1.2.3.5", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod1", Namespace: ns}},
{IP: "1.2.3.6", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod2", Namespace: ns}}, {IP: "1.2.3.6", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod2", Namespace: ns}},
}, },
Ports: []api.EndpointPort{ Ports: []api.EndpointPort{
{Name: "port0", Port: 8080, Protocol: "TCP"}, {Name: "port0", Port: 8080, Protocol: "TCP"},
...@@ -528,7 +529,7 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) { ...@@ -528,7 +529,7 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) {
}, },
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "6.7.8.9"}}, Addresses: []api.EndpointAddress{{IP: "6.7.8.9", NodeName: &emptyNodeName}},
Ports: []api.EndpointPort{{Port: 1000}}, Ports: []api.EndpointPort{{Port: 1000}},
}}, }},
}}) }})
...@@ -558,7 +559,7 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) { ...@@ -558,7 +559,7 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) {
Labels: serviceLabels, Labels: serviceLabels,
}, },
Subsets: []api.EndpointSubset{{ Subsets: []api.EndpointSubset{{
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}}, Addresses: []api.EndpointAddress{{IP: "1.2.3.4", NodeName: &emptyNodeName, TargetRef: &api.ObjectReference{Kind: "Pod", Name: "pod0", Namespace: ns}}},
Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}}, Ports: []api.EndpointPort{{Port: 8080, Protocol: "TCP"}},
}}, }},
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment