Skip to content

Commit 1c80dc4

Browse files
bertinattobertinatto
committed
Revert "add more testing for node.status.addresses"
This reverts commit 7917e8b.
1 parent 58cada7 commit 1c80dc4

File tree

3 files changed

+7
-133
lines changed

3 files changed

+7
-133
lines changed

Diff for: ‎pkg/kubelet/kubelet_node_status.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"k8s.io/apimachinery/pkg/api/resource"
3333
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/types"
35-
utilnet "k8s.io/apimachinery/pkg/util/net"
3635
"k8s.io/apimachinery/pkg/util/sets"
3736
utilfeature "k8s.io/apiserver/pkg/util/feature"
3837
cloudprovider "k8s.io/cloud-provider"
@@ -814,7 +813,7 @@ func (kl *Kubelet) defaultNodeStatusFuncs() []func(context.Context, *v1.Node) er
814813
}
815814
var setters []func(ctx context.Context, n *v1.Node) error
816815
setters = append(setters,
817-
nodestatus.NodeAddress(kl.nodeIPs, kl.nodeIPValidator, kl.hostname, kl.hostnameOverridden, kl.externalCloudProvider, kl.cloud, nodeAddressesFunc, utilnet.ResolveBindAddress),
816+
nodestatus.NodeAddress(kl.nodeIPs, kl.nodeIPValidator, kl.hostname, kl.hostnameOverridden, kl.externalCloudProvider, kl.cloud, nodeAddressesFunc),
818817
nodestatus.MachineInfo(string(kl.nodeName), kl.maxPods, kl.podsPerCore, kl.GetCachedMachineInfo, kl.containerManager.GetCapacity,
819818
kl.containerManager.GetDevicePluginResourceCapacity, kl.containerManager.GetNodeAllocatableReservation, kl.recordEvent, kl.supportLocalStorageCapacityIsolation()),
820819
nodestatus.VersionInfo(kl.cadvisor.VersionInfo, kl.containerRuntime.Type, kl.containerRuntime.Version),

Diff for: ‎pkg/kubelet/nodestatus/setters.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"k8s.io/apimachinery/pkg/api/resource"
3333
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3434
"k8s.io/apimachinery/pkg/util/errors"
35+
utilnet "k8s.io/apimachinery/pkg/util/net"
3536
utilfeature "k8s.io/apiserver/pkg/util/feature"
3637
cloudprovider "k8s.io/cloud-provider"
3738
cloudproviderapi "k8s.io/cloud-provider/api"
@@ -66,7 +67,6 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs
6667
externalCloudProvider bool, // typically Kubelet.externalCloudProvider
6768
cloud cloudprovider.Interface, // typically Kubelet.cloud
6869
nodeAddressesFunc func() ([]v1.NodeAddress, error), // typically Kubelet.cloudResourceSyncManager.NodeAddresses
69-
resolveAddressFunc func(net.IP) (net.IP, error), // typically k8s.io/apimachinery/pkg/util/net.ResolveBindAddress
7070
) Setter {
7171
var nodeIP, secondaryNodeIP net.IP
7272
if len(nodeIPs) > 0 {
@@ -226,7 +226,7 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs
226226
}
227227

228228
if ipAddr == nil {
229-
ipAddr, err = resolveAddressFunc(nodeIP)
229+
ipAddr, err = utilnet.ResolveBindAddress(nodeIP)
230230
}
231231
}
232232

Diff for: ‎pkg/kubelet/nodestatus/setters_test.go

+4-129
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,12 @@ func TestNodeAddress(t *testing.T) {
6363
cloudProviderExternal
6464
cloudProviderNone
6565
)
66-
6766
existingNodeAddress := v1.NodeAddress{Address: "10.1.1.2"}
6867
cases := []struct {
6968
name string
7069
hostnameOverride bool
7170
nodeIP net.IP
7271
secondaryNodeIP net.IP
73-
resolvedIP net.IP
7472
cloudProviderType cloudProviderType
7573
nodeAddresses []v1.NodeAddress
7674
expectedAddresses []v1.NodeAddress
@@ -236,120 +234,17 @@ func TestNodeAddress(t *testing.T) {
236234
shouldError: false,
237235
},
238236
{
239-
name: "no cloud provider and nodeIP IPv4 unspecified",
240-
nodeIP: netutils.ParseIPSloppy("0.0.0.0"),
241-
resolvedIP: netutils.ParseIPSloppy("10.0.0.2"),
242-
nodeAddresses: []v1.NodeAddress{},
243-
cloudProviderType: cloudProviderNone,
244-
expectedAddresses: []v1.NodeAddress{
245-
{Type: v1.NodeInternalIP, Address: "10.0.0.2"},
246-
{Type: v1.NodeHostName, Address: testKubeletHostname},
247-
},
248-
shouldError: false,
249-
},
250-
{
251-
name: "no cloud provider and nodeIP IPv6 unspecified",
252-
nodeIP: netutils.ParseIPSloppy("::"),
253-
resolvedIP: netutils.ParseIPSloppy("2001:db2::2"),
254-
nodeAddresses: []v1.NodeAddress{},
255-
cloudProviderType: cloudProviderNone,
256-
expectedAddresses: []v1.NodeAddress{
257-
{Type: v1.NodeInternalIP, Address: "2001:db2::2"},
258-
{Type: v1.NodeHostName, Address: testKubeletHostname},
259-
},
260-
shouldError: false,
261-
},
262-
{
263-
name: "legacy cloud provider and nodeIP IPv4 unspecified",
264-
nodeIP: netutils.ParseIPSloppy("0.0.0.0"),
265-
resolvedIP: netutils.ParseIPSloppy("10.0.0.2"),
266-
nodeAddresses: []v1.NodeAddress{},
267-
cloudProviderType: cloudProviderLegacy,
268-
expectedAddresses: []v1.NodeAddress{
269-
{Type: v1.NodeHostName, Address: testKubeletHostname},
270-
},
271-
shouldError: true,
272-
},
273-
{
274-
name: "legacy cloud provider and nodeIP IPv6 unspecified",
275-
nodeIP: netutils.ParseIPSloppy("::"),
276-
resolvedIP: netutils.ParseIPSloppy("2001:db2::2"),
277-
nodeAddresses: []v1.NodeAddress{},
278-
cloudProviderType: cloudProviderLegacy,
279-
expectedAddresses: []v1.NodeAddress{
280-
{Type: v1.NodeHostName, Address: testKubeletHostname},
281-
},
282-
shouldError: true,
283-
},
284-
{
285-
name: "cloud provider is external and nodeIP IPv4 unspecified",
286-
nodeIP: netutils.ParseIPSloppy("0.0.0.0"),
287-
resolvedIP: netutils.ParseIPSloppy("10.0.0.2"),
288-
nodeAddresses: []v1.NodeAddress{},
289-
cloudProviderType: cloudProviderExternal,
290-
expectedAddresses: []v1.NodeAddress{
291-
{Type: v1.NodeInternalIP, Address: "10.0.0.2"},
292-
{Type: v1.NodeHostName, Address: testKubeletHostname},
293-
},
294-
shouldError: false,
295-
},
296-
{
297-
name: "cloud provider is external and nodeIP IPv6 unspecified",
237+
name: "cloud provider is external and nodeIP unspecified",
298238
nodeIP: netutils.ParseIPSloppy("::"),
299-
resolvedIP: netutils.ParseIPSloppy("2001:db2::2"),
300239
nodeAddresses: []v1.NodeAddress{},
301240
cloudProviderType: cloudProviderExternal,
302241
expectedAddresses: []v1.NodeAddress{
303-
{Type: v1.NodeInternalIP, Address: "2001:db2::2"},
304242
{Type: v1.NodeHostName, Address: testKubeletHostname},
305243
},
306244
shouldError: false,
307245
},
308246
{
309-
name: "no cloud provider and no nodeIP resolve IPv4",
310-
resolvedIP: netutils.ParseIPSloppy("10.0.0.2"),
311-
nodeAddresses: []v1.NodeAddress{},
312-
cloudProviderType: cloudProviderNone,
313-
expectedAddresses: []v1.NodeAddress{
314-
{Type: v1.NodeInternalIP, Address: "10.0.0.2"},
315-
{Type: v1.NodeHostName, Address: testKubeletHostname},
316-
},
317-
shouldError: false,
318-
},
319-
{
320-
name: "no cloud provider and no nodeIP resolve IPv6",
321-
resolvedIP: netutils.ParseIPSloppy("2001:db2::2"),
322-
nodeAddresses: []v1.NodeAddress{},
323-
cloudProviderType: cloudProviderNone,
324-
expectedAddresses: []v1.NodeAddress{
325-
{Type: v1.NodeInternalIP, Address: "2001:db2::2"},
326-
{Type: v1.NodeHostName, Address: testKubeletHostname},
327-
},
328-
shouldError: false,
329-
},
330-
{
331-
name: "legacy cloud provider and no nodeIP",
332-
resolvedIP: netutils.ParseIPSloppy("10.0.0.2"),
333-
nodeAddresses: []v1.NodeAddress{},
334-
cloudProviderType: cloudProviderLegacy,
335-
expectedAddresses: []v1.NodeAddress{
336-
{Type: v1.NodeHostName, Address: testKubeletHostname},
337-
},
338-
shouldError: true,
339-
},
340-
{
341-
name: "cloud provider is external and no nodeIP resolve IPv4",
342-
resolvedIP: netutils.ParseIPSloppy("10.0.0.2"),
343-
nodeAddresses: []v1.NodeAddress{},
344-
cloudProviderType: cloudProviderExternal,
345-
expectedAddresses: []v1.NodeAddress{
346-
{Type: v1.NodeHostName, Address: testKubeletHostname},
347-
},
348-
shouldError: false,
349-
},
350-
{
351-
name: "cloud provider is external and no nodeIP resolve IPv6",
352-
resolvedIP: netutils.ParseIPSloppy("2001:db2::2"),
247+
name: "cloud provider is external and no nodeIP",
353248
nodeAddresses: []v1.NodeAddress{},
354249
cloudProviderType: cloudProviderExternal,
355250
expectedAddresses: []v1.NodeAddress{
@@ -743,20 +638,6 @@ func TestNodeAddress(t *testing.T) {
743638
return testCase.nodeAddresses, nil
744639
}
745640

746-
net.DefaultResolver = &net.Resolver{
747-
PreferGo: true,
748-
Dial: func(ctx context.Context, network string, address string) (net.Conn, error) {
749-
return nil, fmt.Errorf("error")
750-
},
751-
}
752-
defer func() {
753-
net.DefaultResolver = &net.Resolver{}
754-
}()
755-
756-
resolveAddressFunc := func(net.IP) (net.IP, error) {
757-
return testCase.resolvedIP, nil
758-
}
759-
760641
// cloud provider is expected to be nil if external provider is set or there is no cloud provider
761642
var cloud cloudprovider.Interface
762643
if testCase.cloudProviderType == cloudProviderLegacy {
@@ -778,9 +659,7 @@ func TestNodeAddress(t *testing.T) {
778659
testCase.hostnameOverride,
779660
testCase.cloudProviderType == cloudProviderExternal,
780661
cloud,
781-
nodeAddressesFunc,
782-
resolveAddressFunc,
783-
)
662+
nodeAddressesFunc)
784663

785664
// call setter on existing node
786665
err := setter(ctx, existingNode)
@@ -860,9 +739,6 @@ func TestNodeAddress_NoCloudProvider(t *testing.T) {
860739
nodeAddressesFunc := func() ([]v1.NodeAddress, error) {
861740
return nil, fmt.Errorf("not reached")
862741
}
863-
resolvedAddressesFunc := func(net.IP) (net.IP, error) {
864-
return nil, fmt.Errorf("not reached")
865-
}
866742

867743
// construct setter
868744
setter := NodeAddress(testCase.nodeIPs,
@@ -871,8 +747,7 @@ func TestNodeAddress_NoCloudProvider(t *testing.T) {
871747
false, // hostnameOverridden
872748
false, // externalCloudProvider
873749
nil, // cloud
874-
nodeAddressesFunc,
875-
resolvedAddressesFunc)
750+
nodeAddressesFunc)
876751

877752
// call setter on existing node
878753
err := setter(ctx, existingNode)

0 commit comments

Comments
 (0)