mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
pkg/registry: Replace deprecated pointer function
Signed-off-by: TommyStarK <thomasmilox@gmail.com>
This commit is contained in:
parent
41b442534d
commit
e2d8fc3f62
@ -308,13 +308,13 @@ func TestDropTypeDependentFields(t *testing.T) {
|
||||
svc.Spec.AllocateLoadBalancerNodePorts = nil
|
||||
}
|
||||
setLoadBalancerClass := func(svc *api.Service) {
|
||||
svc.Spec.LoadBalancerClass = utilpointer.StringPtr("test-load-balancer-class")
|
||||
svc.Spec.LoadBalancerClass = utilpointer.String("test-load-balancer-class")
|
||||
}
|
||||
clearLoadBalancerClass := func(svc *api.Service) {
|
||||
svc.Spec.LoadBalancerClass = nil
|
||||
}
|
||||
changeLoadBalancerClass := func(svc *api.Service) {
|
||||
svc.Spec.LoadBalancerClass = utilpointer.StringPtr("test-load-balancer-class-changed")
|
||||
svc.Spec.LoadBalancerClass = utilpointer.String("test-load-balancer-class-changed")
|
||||
}
|
||||
|
||||
testCases := []struct {
|
||||
|
@ -44,20 +44,20 @@ func Test_dropDisabledFieldsOnCreate(t *testing.T) {
|
||||
eps: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -101,20 +101,20 @@ func Test_dropDisabledFieldsOnUpdate(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -124,30 +124,30 @@ func Test_dropDisabledFieldsOnUpdate(t *testing.T) {
|
||||
oldEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1-old"),
|
||||
NodeName: utilpointer.String("node-1-old"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2-old"),
|
||||
NodeName: utilpointer.String("node-2-old"),
|
||||
},
|
||||
},
|
||||
},
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -398,14 +398,14 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
v1Request: true,
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -413,14 +413,14 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
name: "v1beta1 request, without deprecated topology",
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -458,11 +458,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
},
|
||||
@ -473,11 +473,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
},
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
},
|
||||
@ -488,11 +488,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
},
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
},
|
||||
@ -503,11 +503,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
},
|
||||
@ -518,11 +518,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
},
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
},
|
||||
@ -533,11 +533,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
},
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
{
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
DeprecatedTopology: map[string]string{"key": "value"},
|
||||
},
|
||||
},
|
||||
@ -555,19 +555,19 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.StringPtr("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
{Hostname: utilpointer.String("hostname-1")},
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -582,11 +582,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -594,11 +594,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -610,11 +610,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "other": "value"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "foo": "bar"},
|
||||
},
|
||||
},
|
||||
@ -622,11 +622,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "other": "value"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1", "foo": "bar"},
|
||||
},
|
||||
},
|
||||
@ -634,12 +634,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -650,11 +650,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -662,11 +662,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -674,12 +674,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -690,11 +690,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-2"},
|
||||
},
|
||||
},
|
||||
@ -702,11 +702,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-2"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -714,12 +714,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -730,11 +730,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-2"},
|
||||
},
|
||||
},
|
||||
@ -742,12 +742,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
// Invalid node name because it did not exist in previous version of EndpointSlice
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-3"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -755,11 +755,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -770,11 +770,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -782,12 +782,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -795,12 +795,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -811,11 +811,11 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -823,13 +823,13 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "node-1"},
|
||||
},
|
||||
},
|
||||
@ -837,12 +837,12 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1a"),
|
||||
NodeName: utilpointer.StringPtr("node-1"),
|
||||
Hostname: utilpointer.String("hostname-1a"),
|
||||
NodeName: utilpointer.String("node-1"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1b"),
|
||||
NodeName: utilpointer.StringPtr("node-2"),
|
||||
Hostname: utilpointer.String("hostname-1b"),
|
||||
NodeName: utilpointer.String("node-2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -853,19 +853,19 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
originalEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "valid-node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-2"),
|
||||
Hostname: utilpointer.String("hostname-2"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "invalid node-2"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-3"),
|
||||
Hostname: utilpointer.String("hostname-3"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "valid-node-3"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-4"),
|
||||
Hostname: utilpointer.String("hostname-4"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "invalid node-4"},
|
||||
},
|
||||
},
|
||||
@ -873,39 +873,39 @@ func Test_dropTopologyOnV1(t *testing.T) {
|
||||
newEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "valid-node-1"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-2"),
|
||||
Hostname: utilpointer.String("hostname-2"),
|
||||
DeprecatedTopology: map[string]string{corev1.LabelHostname: "invalid node-2"},
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-3"),
|
||||
NodeName: utilpointer.StringPtr("node-3"),
|
||||
Hostname: utilpointer.String("hostname-3"),
|
||||
NodeName: utilpointer.String("node-3"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-4"),
|
||||
NodeName: utilpointer.StringPtr("node-4"),
|
||||
Hostname: utilpointer.String("hostname-4"),
|
||||
NodeName: utilpointer.String("node-4"),
|
||||
},
|
||||
},
|
||||
},
|
||||
expectedEPS: &discovery.EndpointSlice{
|
||||
Endpoints: []discovery.Endpoint{
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-1"),
|
||||
NodeName: utilpointer.StringPtr("valid-node-1"),
|
||||
Hostname: utilpointer.String("hostname-1"),
|
||||
NodeName: utilpointer.String("valid-node-1"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-2"),
|
||||
Hostname: utilpointer.String("hostname-2"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-3"),
|
||||
NodeName: utilpointer.StringPtr("node-3"),
|
||||
Hostname: utilpointer.String("hostname-3"),
|
||||
NodeName: utilpointer.String("node-3"),
|
||||
},
|
||||
{
|
||||
Hostname: utilpointer.StringPtr("hostname-4"),
|
||||
NodeName: utilpointer.StringPtr("node-4"),
|
||||
Hostname: utilpointer.String("hostname-4"),
|
||||
NodeName: utilpointer.String("node-4"),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user