From abf74613acf43bceeae0aa330f12f08fa21932bc Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 20 Aug 2022 14:07:44 +0200 Subject: [PATCH] remove dead code --- pkg/controlplane/instance.go | 36 --------------------- pkg/controlplane/instance_test.go | 54 ------------------------------- 2 files changed, 90 deletions(-) diff --git a/pkg/controlplane/instance.go b/pkg/controlplane/instance.go index 0718a061881..77a8bde3682 100644 --- a/pkg/controlplane/instance.go +++ b/pkg/controlplane/instance.go @@ -82,7 +82,6 @@ import ( kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/routes" "k8s.io/kubernetes/pkg/serviceaccount" - nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/utils/clock" // RESTStorage installers @@ -603,41 +602,6 @@ func (m *Instance) InstallAPIs(apiResourceConfigSource serverstorage.APIResource return nil } -type nodeAddressProvider struct { - nodeClient corev1client.NodeInterface -} - -func (n nodeAddressProvider) externalAddresses() ([]string, error) { - preferredAddressTypes := []apiv1.NodeAddressType{ - apiv1.NodeExternalIP, - } - nodes, err := n.nodeClient.List(context.TODO(), metav1.ListOptions{}) - if err != nil { - return nil, err - } - var matchErr error - addrs := []string{} - for ix := range nodes.Items { - node := &nodes.Items[ix] - addr, err := nodeutil.GetPreferredNodeAddress(node, preferredAddressTypes) - if err != nil { - if _, ok := err.(*nodeutil.NoMatchError); ok { - matchErr = err - continue - } - return nil, err - } - addrs = append(addrs, addr) - } - if len(addrs) == 0 && matchErr != nil { - // We only return an error if we have items. - // Currently we return empty list/no error if Items is empty. - // We do this for backward compatibility reasons. - return nil, matchErr - } - return addrs, nil -} - var ( // stableAPIGroupVersionsEnabledByDefault is a list of our stable versions. stableAPIGroupVersionsEnabledByDefault = []schema.GroupVersion{ diff --git a/pkg/controlplane/instance_test.go b/pkg/controlplane/instance_test.go index a497d080fe7..d6cf52a8b8e 100644 --- a/pkg/controlplane/instance_test.go +++ b/pkg/controlplane/instance_test.go @@ -32,7 +32,6 @@ import ( autoscalingapiv2beta2 "k8s.io/api/autoscaling/v2beta2" batchapiv1beta1 "k8s.io/api/batch/v1beta1" certificatesapiv1beta1 "k8s.io/api/certificates/v1beta1" - apiv1 "k8s.io/api/core/v1" discoveryv1beta1 "k8s.io/api/discovery/v1beta1" eventsv1beta1 "k8s.io/api/events/v1beta1" nodev1beta1 "k8s.io/api/node/v1beta1" @@ -52,7 +51,6 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/kubernetes/fake" restclient "k8s.io/client-go/rest" kubeversion "k8s.io/component-base/version" "k8s.io/kubernetes/pkg/api/legacyscheme" @@ -217,58 +215,6 @@ func TestVersion(t *testing.T) { } } -func makeNodeList(nodes []string, nodeResources apiv1.NodeResources) *apiv1.NodeList { - list := apiv1.NodeList{ - Items: make([]apiv1.Node, len(nodes)), - } - for i := range nodes { - list.Items[i].Name = nodes[i] - list.Items[i].Status.Capacity = nodeResources.Capacity - } - return &list -} - -// TestGetNodeAddresses verifies that proper results are returned -// when requesting node addresses. -func TestGetNodeAddresses(t *testing.T) { - assert := assert.New(t) - - fakeNodeClient := fake.NewSimpleClientset(makeNodeList([]string{"node1", "node2"}, apiv1.NodeResources{})).CoreV1().Nodes() - addressProvider := nodeAddressProvider{fakeNodeClient} - - // Fail case (no addresses associated with nodes) - addrs, err := addressProvider.externalAddresses() - - assert.Error(err, "addresses should have caused an error as there are no addresses.") - assert.Equal([]string(nil), addrs) - - // Pass case with External type IP - nodes, _ := fakeNodeClient.List(context.TODO(), metav1.ListOptions{}) - for index := range nodes.Items { - nodes.Items[index].Status.Addresses = []apiv1.NodeAddress{{Type: apiv1.NodeExternalIP, Address: "127.0.0.1"}} - fakeNodeClient.Update(context.TODO(), &nodes.Items[index], metav1.UpdateOptions{}) - } - addrs, err = addressProvider.externalAddresses() - assert.NoError(err, "addresses should not have returned an error.") - assert.Equal([]string{"127.0.0.1", "127.0.0.1"}, addrs) -} - -func TestGetNodeAddressesWithOnlySomeExternalIP(t *testing.T) { - assert := assert.New(t) - - fakeNodeClient := fake.NewSimpleClientset(makeNodeList([]string{"node1", "node2", "node3"}, apiv1.NodeResources{})).CoreV1().Nodes() - addressProvider := nodeAddressProvider{fakeNodeClient} - - // Pass case with 1 External type IP (index == 1) and nodes (indexes 0 & 2) have no External IP. - nodes, _ := fakeNodeClient.List(context.TODO(), metav1.ListOptions{}) - nodes.Items[1].Status.Addresses = []apiv1.NodeAddress{{Type: apiv1.NodeExternalIP, Address: "127.0.0.1"}} - fakeNodeClient.Update(context.TODO(), &nodes.Items[1], metav1.UpdateOptions{}) - - addrs, err := addressProvider.externalAddresses() - assert.NoError(err, "addresses should not have returned an error.") - assert.Equal([]string{"127.0.0.1"}, addrs) -} - func decodeResponse(resp *http.Response, obj interface{}) error { defer resp.Body.Close()