Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit dd7c079

Browse files
dimsdims
committed
remove context
1 parent 50caefa commit dd7c079

11 files changed

Lines changed: 49 additions & 71 deletions

File tree

‎pkg/cloudprovider/providers/openstack/openstack.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"crypto/tls"
2221
"errors"
2322
"fmt"
@@ -612,7 +611,7 @@ func (os *OpenStack) Zones() (cloudprovider.Zones, bool) {
612611
}
613612

614613
// GetZone returns the current zone
615-
func (os *OpenStack) GetZone(ctx context.Context) (cloudprovider.Zone, error) {
614+
func (os *OpenStack) GetZone() (cloudprovider.Zone, error) {
616615
md, err := getMetadata(os.metadataOpts.SearchOrder)
617616
if err != nil {
618617
return cloudprovider.Zone{}, err
@@ -629,7 +628,7 @@ func (os *OpenStack) GetZone(ctx context.Context) (cloudprovider.Zone, error) {
629628
// GetZoneByProviderID implements Zones.GetZoneByProviderID
630629
// This is particularly useful in external cloud providers where the kubelet
631630
// does not initialize node data.
632-
func (os *OpenStack) GetZoneByProviderID(ctx context.Context, providerID string) (cloudprovider.Zone, error) {
631+
func (os *OpenStack) GetZoneByProviderID(providerID string) (cloudprovider.Zone, error) {
633632
instanceID, err := instanceIDFromProviderID(providerID)
634633
if err != nil {
635634
return cloudprovider.Zone{}, err
@@ -656,7 +655,7 @@ func (os *OpenStack) GetZoneByProviderID(ctx context.Context, providerID string)
656655
// GetZoneByNodeName implements Zones.GetZoneByNodeName
657656
// This is particularly useful in external cloud providers where the kubelet
658657
// does not initialize node data.
659-
func (os *OpenStack) GetZoneByNodeName(ctx context.Context, nodeName types.NodeName) (cloudprovider.Zone, error) {
658+
func (os *OpenStack) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Zone, error) {
660659
compute, err := os.NewComputeV2()
661660
if err != nil {
662661
return cloudprovider.Zone{}, err

‎pkg/cloudprovider/providers/openstack/openstack_instances.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"regexp"
2322

@@ -55,7 +54,7 @@ func (os *OpenStack) Instances() (cloudprovider.Instances, bool) {
5554

5655
// CurrentNodeName implements Instances.CurrentNodeName
5756
// Note this is *not* necessarily the same as hostname.
58-
func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types.NodeName, error) {
57+
func (i *Instances) CurrentNodeName(hostname string) (types.NodeName, error) {
5958
md, err := getMetadata(i.opts.SearchOrder)
6059
if err != nil {
6160
return "", err
@@ -64,12 +63,12 @@ func (i *Instances) CurrentNodeName(ctx context.Context, hostname string) (types
6463
}
6564

6665
// AddSSHKeyToAllInstances is not implemented for OpenStack
67-
func (i *Instances) AddSSHKeyToAllInstances(ctx context.Context, user string, keyData []byte) error {
66+
func (i *Instances) AddSSHKeyToAllInstances(user string, keyData []byte) error {
6867
return cloudprovider.NotImplemented
6968
}
7069

7170
// NodeAddresses implements Instances.NodeAddresses
72-
func (i *Instances) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1.NodeAddress, error) {
71+
func (i *Instances) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) {
7372
glog.V(4).Infof("NodeAddresses(%v) called", name)
7473

7574
addrs, err := getAddressesByName(i.compute, name)
@@ -84,7 +83,7 @@ func (i *Instances) NodeAddresses(ctx context.Context, name types.NodeName) ([]v
8483
// NodeAddressesByProviderID returns the node addresses of an instances with the specified unique providerID
8584
// This method will not be called from the node that is requesting this ID. i.e. metadata service
8685
// and other local methods cannot be used here
87-
func (i *Instances) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error) {
86+
func (i *Instances) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddress, error) {
8887
instanceID, err := instanceIDFromProviderID(providerID)
8988

9089
if err != nil {
@@ -106,7 +105,7 @@ func (i *Instances) NodeAddressesByProviderID(ctx context.Context, providerID st
106105
}
107106

108107
// ExternalID returns the cloud provider ID of the specified instance (deprecated).
109-
func (i *Instances) ExternalID(ctx context.Context, name types.NodeName) (string, error) {
108+
func (i *Instances) ExternalID(name types.NodeName) (string, error) {
110109
srv, err := getServerByName(i.compute, name, true)
111110
if err != nil {
112111
if err == ErrNotFound {
@@ -119,7 +118,7 @@ func (i *Instances) ExternalID(ctx context.Context, name types.NodeName) (string
119118

120119
// InstanceExistsByProviderID returns true if the instance with the given provider id still exists and is running.
121120
// If false is returned with no error, the instance will be immediately deleted by the cloud controller manager.
122-
func (i *Instances) InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error) {
121+
func (i *Instances) InstanceExistsByProviderID(providerID string) (bool, error) {
123122
instanceID, err := instanceIDFromProviderID(providerID)
124123
if err != nil {
125124
return false, err
@@ -154,7 +153,7 @@ func (os *OpenStack) InstanceID() (string, error) {
154153
}
155154

156155
// InstanceID returns the cloud provider ID of the specified instance.
157-
func (i *Instances) InstanceID(ctx context.Context, name types.NodeName) (string, error) {
156+
func (i *Instances) InstanceID(name types.NodeName) (string, error) {
158157
srv, err := getServerByName(i.compute, name, true)
159158
if err != nil {
160159
if err == ErrNotFound {
@@ -170,7 +169,7 @@ func (i *Instances) InstanceID(ctx context.Context, name types.NodeName) (string
170169
// InstanceTypeByProviderID returns the cloudprovider instance type of the node with the specified unique providerID
171170
// This method will not be called from the node that is requesting this ID. i.e. metadata service
172171
// and other local methods cannot be used here
173-
func (i *Instances) InstanceTypeByProviderID(ctx context.Context, providerID string) (string, error) {
172+
func (i *Instances) InstanceTypeByProviderID(providerID string) (string, error) {
174173
instanceID, err := instanceIDFromProviderID(providerID)
175174

176175
if err != nil {
@@ -187,7 +186,7 @@ func (i *Instances) InstanceTypeByProviderID(ctx context.Context, providerID str
187186
}
188187

189188
// InstanceType returns the type of the specified instance.
190-
func (i *Instances) InstanceType(ctx context.Context, name types.NodeName) (string, error) {
189+
func (i *Instances) InstanceType(name types.NodeName) (string, error) {
191190
srv, err := getServerByName(i.compute, name, true)
192191

193192
if err != nil {

‎pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"net"
2322
"reflect"
@@ -458,7 +457,7 @@ func (lbaas *LbaasV2) createLoadBalancer(service *v1.Service, name string, inter
458457
}
459458

460459
// GetLoadBalancer returns whether the specified load balancer exists and its status
461-
func (lbaas *LbaasV2) GetLoadBalancer(ctx context.Context, clusterName string, service *v1.Service) (*v1.LoadBalancerStatus, bool, error) {
460+
func (lbaas *LbaasV2) GetLoadBalancer(clusterName string, service *v1.Service) (*v1.LoadBalancerStatus, bool, error) {
462461
loadBalancerName := cloudprovider.GetLoadBalancerName(service)
463462
loadbalancer, err := getLoadbalancerByName(lbaas.lb, loadBalancerName)
464463
if err == ErrNotFound {
@@ -636,7 +635,7 @@ func getFloatingNetworkIDForLB(client *gophercloud.ServiceClient) (string, error
636635
// each region.
637636

638637
// EnsureLoadBalancer creates a new load balancer 'name', or updates the existing one.
639-
func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string, apiService *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
638+
func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
640639
glog.V(4).Infof("EnsureLoadBalancer(%v, %v, %v, %v, %v, %v, %v)", clusterName, apiService.Namespace, apiService.Name, apiService.Spec.LoadBalancerIP, apiService.Spec.Ports, nodes, apiService.Annotations)
641640

642641
if len(nodes) == 0 {
@@ -973,7 +972,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
973972
err := lbaas.ensureSecurityGroup(clusterName, apiService, nodes, loadbalancer)
974973
if err != nil {
975974
// cleanup what was created so far
976-
_ = lbaas.EnsureLoadBalancerDeleted(ctx, clusterName, apiService)
975+
_ = lbaas.EnsureLoadBalancerDeleted(clusterName, apiService)
977976
return status, err
978977
}
979978
}
@@ -1154,7 +1153,7 @@ func (lbaas *LbaasV2) ensureSecurityGroup(clusterName string, apiService *v1.Ser
11541153
}
11551154

11561155
// UpdateLoadBalancer updates hosts under the specified load balancer.
1157-
func (lbaas *LbaasV2) UpdateLoadBalancer(ctx context.Context, clusterName string, service *v1.Service, nodes []*v1.Node) error {
1156+
func (lbaas *LbaasV2) UpdateLoadBalancer(clusterName string, service *v1.Service, nodes []*v1.Node) error {
11581157
loadBalancerName := cloudprovider.GetLoadBalancerName(service)
11591158
glog.V(4).Infof("UpdateLoadBalancer(%v, %v, %v)", clusterName, loadBalancerName, nodes)
11601159

@@ -1375,7 +1374,7 @@ func (lbaas *LbaasV2) updateSecurityGroup(clusterName string, apiService *v1.Ser
13751374
}
13761375

13771376
// EnsureLoadBalancerDeleted deletes the specified load balancer
1378-
func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(ctx context.Context, clusterName string, service *v1.Service) error {
1377+
func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.Service) error {
13791378
loadBalancerName := cloudprovider.GetLoadBalancerName(service)
13801379
glog.V(4).Infof("EnsureLoadBalancerDeleted(%v, %v)", clusterName, loadBalancerName)
13811380

‎pkg/cloudprovider/providers/openstack/openstack_routes.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"errors"
2221

2322
"github.com/gophercloud/gophercloud"
@@ -53,7 +52,7 @@ func NewRoutes(compute *gophercloud.ServiceClient, network *gophercloud.ServiceC
5352
}
5453

5554
// ListRoutes lists all managed routes that belong to the specified clusterName
56-
func (r *Routes) ListRoutes(ctx context.Context, clusterName string) ([]*cloudprovider.Route, error) {
55+
func (r *Routes) ListRoutes(clusterName string) ([]*cloudprovider.Route, error) {
5756
glog.V(4).Infof("ListRoutes(%v)", clusterName)
5857

5958
nodeNamesByAddr := make(map[string]types.NodeName)
@@ -141,7 +140,7 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron
141140
}
142141

143142
// CreateRoute creates the described managed route
144-
func (r *Routes) CreateRoute(ctx context.Context, clusterName string, nameHint string, route *cloudprovider.Route) error {
143+
func (r *Routes) CreateRoute(clusterName string, nameHint string, route *cloudprovider.Route) error {
145144
glog.V(4).Infof("CreateRoute(%v, %v, %v)", clusterName, nameHint, route)
146145

147146
onFailure := newCaller()
@@ -214,7 +213,7 @@ func (r *Routes) CreateRoute(ctx context.Context, clusterName string, nameHint s
214213
}
215214

216215
// DeleteRoute deletes the specified managed route
217-
func (r *Routes) DeleteRoute(ctx context.Context, clusterName string, route *cloudprovider.Route) error {
216+
func (r *Routes) DeleteRoute(clusterName string, route *cloudprovider.Route) error {
218217
glog.V(4).Infof("DeleteRoute(%v, %v)", clusterName, route)
219218

220219
onFailure := newCaller()

‎pkg/cloudprovider/providers/openstack/openstack_routes_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"net"
2221
"testing"
2322

@@ -53,12 +52,12 @@ func TestRoutes(t *testing.T) {
5352
DestinationCIDR: "10.164.2.0/24",
5453
TargetNode: types.NodeName(servername),
5554
}
56-
err = r.CreateRoute(context.TODO(), clusterName, "myhint", &newroute)
55+
err = r.CreateRoute(clusterName, "myhint", &newroute)
5756
if err != nil {
5857
t.Fatalf("CreateRoute error: %v", err)
5958
}
6059

61-
routelist, err := r.ListRoutes(context.TODO(), clusterName)
60+
routelist, err := r.ListRoutes(clusterName)
6261
if err != nil {
6362
t.Fatalf("ListRoutes() error: %v", err)
6463
}
@@ -71,7 +70,7 @@ func TestRoutes(t *testing.T) {
7170
t.Logf("%s via %s", cidr, route.TargetNode)
7271
}
7372

74-
err = r.DeleteRoute(context.TODO(), clusterName, &newroute)
73+
err = r.DeleteRoute(clusterName, &newroute)
7574
if err != nil {
7675
t.Fatalf("DeleteRoute error: %v", err)
7776
}

‎pkg/cloudprovider/providers/openstack/openstack_test.go‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"os"
2322
"reflect"
@@ -131,19 +130,6 @@ func TestReadConfig(t *testing.T) {
131130
t.Errorf("incorrect tenant name: %s", cfg.Global.TenantName)
132131
}
133132

134-
if cfg.Global.UserId != "user" {
135-
t.Errorf("incorrect userid: %s", cfg.Global.UserId)
136-
}
137-
138-
if cfg.Global.Password != "mypass" {
139-
t.Errorf("incorrect password: %s", cfg.Global.Password)
140-
}
141-
142-
// config file wins over environment variable
143-
if cfg.Global.TenantName != "demo" {
144-
t.Errorf("incorrect tenant name: %s", cfg.Global.TenantName)
145-
}
146-
147133
if !cfg.LoadBalancer.CreateMonitor {
148134
t.Errorf("incorrect lb.createmonitor: %t", cfg.LoadBalancer.CreateMonitor)
149135
}
@@ -506,7 +492,7 @@ func TestLoadBalancer(t *testing.T) {
506492
t.Fatalf("LoadBalancer() returned false - perhaps your stack doesn't support Neutron?")
507493
}
508494

509-
_, exists, err := lb.GetLoadBalancer(context.TODO(), testClusterName, &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "noexist"}})
495+
_, exists, err := lb.GetLoadBalancer(testClusterName, &v1.Service{ObjectMeta: metav1.ObjectMeta{Name: "noexist"}})
510496
if err != nil {
511497
t.Fatalf("GetLoadBalancer(\"noexist\") returned error: %s", err)
512498
}
@@ -532,7 +518,7 @@ func TestZones(t *testing.T) {
532518
t.Fatalf("Zones() returned false")
533519
}
534520

535-
zone, err := z.GetZone(context.TODO())
521+
zone, err := z.GetZone()
536522
if err != nil {
537523
t.Fatalf("GetZone() returned error: %s", err)
538524
}

‎pkg/cloudprovider/providers/openstack/openstack_volumes.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package openstack
1818

1919
import (
20-
"context"
2120
"errors"
2221
"fmt"
2322
"io/ioutil"

‎pkg/flexvolume/cinder_client.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ type openStackConfig struct {
4343

4444
func (cfg openStackConfig) toAuthOptions() gophercloud.AuthOptions {
4545
return gophercloud.AuthOptions{
46-
IdentityEndpoint: cfg.Global.AuthUrl,
46+
IdentityEndpoint: cfg.Global.AuthURL,
4747
Username: cfg.Global.Username,
48-
UserID: cfg.Global.UserId,
48+
UserID: cfg.Global.UserID,
4949
Password: cfg.Global.Password,
50-
TenantID: cfg.Global.TenantId,
50+
TenantID: cfg.Global.TenantID,
5151
TenantName: cfg.Global.TenantName,
52-
DomainID: cfg.Global.DomainId,
52+
DomainID: cfg.Global.DomainID,
5353
DomainName: cfg.Global.DomainName,
5454

5555
// Persistent service, so we need to be able to renew tokens.

‎pkg/volume/cinder/attacher.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package cinder
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"os"
2322
"path"
@@ -402,7 +401,7 @@ func (attacher *cinderDiskAttacher) nodeInstanceID(nodeName types.NodeName) (str
402401
if !res {
403402
return "", fmt.Errorf("failed to list openstack instances")
404403
}
405-
instanceID, err := instances.InstanceID(context.TODO(), nodeName)
404+
instanceID, err := instances.InstanceID(nodeName)
406405
if err != nil {
407406
return "", err
408407
}

‎pkg/volume/cinder/attacher_test.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package cinder
1818

1919
import (
20-
"context"
2120
"errors"
2221
"reflect"
2322
"testing"
@@ -704,42 +703,42 @@ type instances struct {
704703
instanceID string
705704
}
706705

707-
func (instances *instances) NodeAddresses(ctx context.Context, name types.NodeName) ([]v1.NodeAddress, error) {
706+
func (instances *instances) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) {
708707
return []v1.NodeAddress{}, errors.New("Not implemented")
709708
}
710709

711-
func (instances *instances) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error) {
710+
func (instances *instances) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddress, error) {
712711
return []v1.NodeAddress{}, errors.New("Not implemented")
713712
}
714713

715-
func (instances *instances) ExternalID(ctx context.Context, name types.NodeName) (string, error) {
714+
func (instances *instances) ExternalID(name types.NodeName) (string, error) {
716715
return "", errors.New("Not implemented")
717716
}
718717

719-
func (instances *instances) InstanceID(ctx context.Context, name types.NodeName) (string, error) {
718+
func (instances *instances) InstanceID(name types.NodeName) (string, error) {
720719
return instances.instanceID, nil
721720
}
722721

723-
func (instances *instances) InstanceType(ctx context.Context, name types.NodeName) (string, error) {
722+
func (instances *instances) InstanceType(name types.NodeName) (string, error) {
724723
return "", errors.New("Not implemented")
725724
}
726725

727-
func (instances *instances) InstanceTypeByProviderID(ctx context.Context, providerID string) (string, error) {
726+
func (instances *instances) InstanceTypeByProviderID(providerID string) (string, error) {
728727
return "", errors.New("Not implemented")
729728
}
730729

731-
func (instances *instances) InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error) {
730+
func (instances *instances) InstanceExistsByProviderID(providerID string) (bool, error) {
732731
return false, errors.New("unimplemented")
733732
}
734733

735734
func (instances *instances) List(filter string) ([]types.NodeName, error) {
736735
return []types.NodeName{}, errors.New("Not implemented")
737736
}
738737

739-
func (instances *instances) AddSSHKeyToAllInstances(ctx context.Context, user string, keyData []byte) error {
738+
func (instances *instances) AddSSHKeyToAllInstances(user string, keyData []byte) error {
740739
return errors.New("Not implemented")
741740
}
742741

743-
func (instances *instances) CurrentNodeName(ctx context.Context, hostname string) (types.NodeName, error) {
742+
func (instances *instances) CurrentNodeName(hostname string) (types.NodeName, error) {
744743
return "", errors.New("Not implemented")
745744
}

0 commit comments

Comments
 (0)