Skip to content

Commit

Permalink
Merge pull request #93 from andrewsykim/upgrade-1.10
Browse files Browse the repository at this point in the history 
Upgrade all Kubernetes dependencies to v1.10.2
  • Loading branch information
@andrewsykim
andrewsykim committed May 9, 2018
2 parents eb8c52b + 2992808 commit 0e41681
Show file tree
Hide file tree
Showing 2,680 changed files with 511,547 additions and 86,278 deletions.
391 changes: 314 additions & 77 deletions Gopkg.lock
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@

[[override]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.8.2"
version = "kubernetes-1.10.2"

[[override]]
name = "k8s.io/client-go"
version = "kubernetes-1.8.2"
version = "kubernetes-1.10.2"

[[constraint]]
branch = "master"
version = "v1.2.0"
name = "github.com/digitalocean/godo"

[[constraint]]
Expand All @@ -51,16 +51,16 @@

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.8.2"
version = "kubernetes-1.10.2"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.8.2"
version = "kubernetes-1.10.2"

[[constraint]]
name = "k8s.io/apiserver"
version = "kubernetes-1.8.2"
version = "kubernetes-1.10.2"

[[constraint]]
name = "k8s.io/kubernetes"
version = "1.8.2"
version = "1.10.2"
2 changes: 1 addition & 1 deletion do/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ limitations under the License.
package do

import (
"context"
"fmt"

"k8s.io/api/core/v1"

"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"
)

const apiPerPage = 100
Expand Down
34 changes: 17 additions & 17 deletions do/droplets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package do

import (
"context"
"errors"
"fmt"
"net/http"
Expand All @@ -28,7 +29,6 @@ import (
"k8s.io/kubernetes/pkg/cloudprovider"

"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"
)

type instances struct {
Expand All @@ -45,8 +45,8 @@ func newInstances(client *godo.Client, region string) cloudprovider.Instances {
//
// When nodeName identifies more than one droplet, only the first will be
// considered.
func (i *instances) NodeAddresses(nodeName types.NodeName) ([]v1.NodeAddress, error) {
droplet, err := dropletByName(context.TODO(), i.client, nodeName)
func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName) ([]v1.NodeAddress, error) {
droplet, err := dropletByName(ctx, i.client, nodeName)
if err != nil {
return nil, err
}
Expand All @@ -57,13 +57,13 @@ func (i *instances) NodeAddresses(nodeName types.NodeName) ([]v1.NodeAddress, er
// NodeAddressesByProviderID returns all the valid addresses of the droplet
// identified by providerID. Only the public/private IPv4 addresses will be
// considered for now.
func (i *instances) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddress, error) {
func (i *instances) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error) {
id, err := dropletIDFromProviderID(providerID)
if err != nil {
return nil, err
}

droplet, err := dropletByID(context.TODO(), i.client, id)
droplet, err := dropletByID(ctx, i.client, id)
if err != nil {
return nil, err
}
Expand All @@ -77,22 +77,22 @@ func (i *instances) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddre
//
// When nodeName identifies more than one droplet, only the first will be
// considered.
func (i *instances) ExternalID(nodeName types.NodeName) (string, error) {
return i.InstanceID(nodeName)
func (i *instances) ExternalID(ctx context.Context, nodeName types.NodeName) (string, error) {
return i.InstanceID(ctx, nodeName)
}

// InstanceID returns the cloud provider ID of the droplet identified by nodeName.
func (i *instances) InstanceID(nodeName types.NodeName) (string, error) {
droplet, err := dropletByName(context.TODO(), i.client, nodeName)
func (i *instances) InstanceID(ctx context.Context, nodeName types.NodeName) (string, error) {
droplet, err := dropletByName(ctx, i.client, nodeName)
if err != nil {
return "", err
}
return strconv.Itoa(droplet.ID), nil
}

// InstanceType returns the type of the droplet identified by name.
func (i *instances) InstanceType(name types.NodeName) (string, error) {
droplet, err := dropletByName(context.TODO(), i.client, name)
func (i *instances) InstanceType(ctx context.Context, name types.NodeName) (string, error) {
droplet, err := dropletByName(ctx, i.client, name)
if err != nil {
return "", err
}
Expand All @@ -101,13 +101,13 @@ func (i *instances) InstanceType(name types.NodeName) (string, error) {
}

// InstanceTypeByProviderID returns the type of the droplet identified by providerID.
func (i *instances) InstanceTypeByProviderID(providerID string) (string, error) {
func (i *instances) InstanceTypeByProviderID(ctx context.Context, providerID string) (string, error) {
id, err := dropletIDFromProviderID(providerID)
if err != nil {
return "", err
}

droplet, err := dropletByID(context.TODO(), i.client, id)
droplet, err := dropletByID(ctx, i.client, id)
if err != nil {
return "", err
}
Expand All @@ -116,18 +116,18 @@ func (i *instances) InstanceTypeByProviderID(providerID string) (string, error)
}

// AddSSHKeyToAllInstances is not implemented; it always returns an error.
func (i *instances) AddSSHKeyToAllInstances(user string, keyData []byte) error {
func (i *instances) AddSSHKeyToAllInstances(ctx context.Context, user string, keyData []byte) error {
return errors.New("not implemented")
}

// CurrentNodeName returns hostname as a NodeName value.
func (i *instances) CurrentNodeName(hostname string) (types.NodeName, error) {
func (i *instances) CurrentNodeName(ctx context.Context, hostname string) (types.NodeName, error) {
return types.NodeName(hostname), nil
}

// InstanceExistsByProviderID returns true if the droplet identified by
// providerID is running.
func (i *instances) InstanceExistsByProviderID(providerID string) (bool, error) {
func (i *instances) InstanceExistsByProviderID(ctx context.Context, providerID string) (bool, error) {
// NOTE: when false is returned with no error, the instance will be
// immediately deleted by the cloud controller manager.

Expand All @@ -136,7 +136,7 @@ func (i *instances) InstanceExistsByProviderID(providerID string) (bool, error)
return false, err
}

_, err = dropletByID(context.TODO(), i.client, id)
_, err = dropletByID(ctx, i.client, id)
if err == nil {
return true, nil
}
Expand Down
10 changes: 5 additions & 5 deletions do/droplets_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package do

import (
"bytes"
"context"
"errors"
"io/ioutil"
"net/http"
Expand All @@ -28,7 +29,6 @@ import (
"k8s.io/kubernetes/pkg/cloudprovider"

"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"
)

type fakeDropletService struct {
Expand Down Expand Up @@ -173,7 +173,7 @@ func TestNodeAddresses(t *testing.T) {
},
}

addresses, err := instances.NodeAddresses("test-droplet")
addresses, err := instances.NodeAddresses(context.TODO(), "test-droplet")

if !reflect.DeepEqual(addresses, expectedAddresses) {
t.Errorf("unexpected node addresses. got: %v want: %v", addresses, expectedAddresses)
Expand Down Expand Up @@ -209,7 +209,7 @@ func TestNodeAddressesByProviderID(t *testing.T) {
},
}

addresses, err := instances.NodeAddressesByProviderID("digitalocean://123")
addresses, err := instances.NodeAddressesByProviderID(context.TODO(), "digitalocean://123")

if !reflect.DeepEqual(addresses, expectedAddresses) {
t.Errorf("unexpected node addresses. got: %v want: %v", addresses, expectedAddresses)
Expand All @@ -233,7 +233,7 @@ func TestInstanceID(t *testing.T) {
client := newFakeClient(fake)
instances := newInstances(client, "nyc1")

id, err := instances.InstanceID("test-droplet")
id, err := instances.InstanceID(context.TODO(), "test-droplet")
if err != nil {
t.Errorf("expected nil error, got: %v", err)
}
Expand All @@ -256,7 +256,7 @@ func TestInstanceType(t *testing.T) {
client := newFakeClient(fake)
instances := newInstances(client, "nyc1")

instanceType, err := instances.InstanceType("test-droplet")
instanceType, err := instances.InstanceType(context.TODO(), "test-droplet")
if err != nil {
t.Errorf("expected nil error, got: %v", err)
}
Expand Down
30 changes: 14 additions & 16 deletions do/loadbalancers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package do

import (
goctx "context"
"context"
"errors"
"fmt"
"strconv"
Expand All @@ -28,7 +28,6 @@ import (
"k8s.io/kubernetes/pkg/cloudprovider"

"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"
"github.com/golang/glog"
)

Expand Down Expand Up @@ -104,9 +103,9 @@ func newLoadbalancers(client *godo.Client, region string) cloudprovider.LoadBala
// GetLoadBalancer returns the *v1.LoadBalancerStatus of service.
//
// GetLoadBalancer will not modify service.
func (l *loadbalancers) GetLoadBalancer(clusterName string, service *v1.Service) (*v1.LoadBalancerStatus, bool, error) {
func (l *loadbalancers) GetLoadBalancer(ctx context.Context, clusterName string, service *v1.Service) (*v1.LoadBalancerStatus, bool, error) {
lbName := cloudprovider.GetLoadBalancerName(service)
lb, err := l.lbByName(context.TODO(), lbName)
lb, err := l.lbByName(ctx, lbName)
if err != nil {
if err == errLBNotFound {
return nil, false, nil
Expand Down Expand Up @@ -135,8 +134,8 @@ func (l *loadbalancers) GetLoadBalancer(clusterName string, service *v1.Service)
// service.
//
// EnsureLoadBalancer will not modify service or nodes.
func (l *loadbalancers) EnsureLoadBalancer(clusterName string, service *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
lbStatus, exists, err := l.GetLoadBalancer(clusterName, service)
func (l *loadbalancers) EnsureLoadBalancer(ctx context.Context, clusterName string, service *v1.Service, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
lbStatus, exists, err := l.GetLoadBalancer(ctx, clusterName, service)
if err != nil {
return nil, err
}
Expand All @@ -147,7 +146,7 @@ func (l *loadbalancers) EnsureLoadBalancer(clusterName string, service *v1.Servi
return nil, err
}

lb, _, err := l.client.LoadBalancers.Create(context.TODO(), lbRequest)
lb, _, err := l.client.LoadBalancers.Create(ctx, lbRequest)
if err != nil {
return nil, err
}
Expand All @@ -166,12 +165,12 @@ func (l *loadbalancers) EnsureLoadBalancer(clusterName string, service *v1.Servi
}, nil
}

err = l.UpdateLoadBalancer(clusterName, service, nodes)
err = l.UpdateLoadBalancer(ctx, clusterName, service, nodes)
if err != nil {
return nil, err
}

lbStatus, exists, err = l.GetLoadBalancer(clusterName, service)
lbStatus, exists, err = l.GetLoadBalancer(ctx, clusterName, service)
if err != nil {
return nil, err
}
Expand All @@ -184,19 +183,19 @@ func (l *loadbalancers) EnsureLoadBalancer(clusterName string, service *v1.Servi
// the droplets in nodes.
//
// UpdateLoadBalancer will not modify service or nodes.
func (l *loadbalancers) UpdateLoadBalancer(clusterName string, service *v1.Service, nodes []*v1.Node) error {
func (l *loadbalancers) UpdateLoadBalancer(ctx context.Context, clusterName string, service *v1.Service, nodes []*v1.Node) error {
lbRequest, err := l.buildLoadBalancerRequest(service, nodes)
if err != nil {
return err
}

lbName := cloudprovider.GetLoadBalancerName(service)
lb, err := l.lbByName(context.TODO(), lbName)
lb, err := l.lbByName(ctx, lbName)
if err != nil {
return err
}

_, _, err = l.client.LoadBalancers.Update(context.TODO(), lb.ID, lbRequest)
_, _, err = l.client.LoadBalancers.Update(ctx, lb.ID, lbRequest)
return err
}

Expand All @@ -205,8 +204,8 @@ func (l *loadbalancers) UpdateLoadBalancer(clusterName string, service *v1.Servi
// successfully deleted.
//
// EnsureLoadBalancerDeleted will not modify service.
func (l *loadbalancers) EnsureLoadBalancerDeleted(clusterName string, service *v1.Service) error {
_, exists, err := l.GetLoadBalancer(clusterName, service)
func (l *loadbalancers) EnsureLoadBalancerDeleted(ctx context.Context, clusterName string, service *v1.Service) error {
_, exists, err := l.GetLoadBalancer(ctx, clusterName, service)
if err != nil {
return err
}
Expand All @@ -215,7 +214,6 @@ func (l *loadbalancers) EnsureLoadBalancerDeleted(clusterName string, service *v
return nil
}

ctx := context.TODO()
lbName := cloudprovider.GetLoadBalancerName(service)

lb, err := l.lbByName(ctx, lbName)
Expand Down Expand Up @@ -319,7 +317,7 @@ func (l *loadbalancers) buildLoadBalancerRequest(service *v1.Service, nodes []*v

func (l *loadbalancers) waitActive(lbID string) (*godo.LoadBalancer, error) {

ctx, cancel := goctx.WithTimeout(goctx.TODO(), time.Second*time.Duration(l.lbActiveTimeout))
ctx, cancel := context.WithTimeout(context.TODO(), time.Second*time.Duration(l.lbActiveTimeout))
defer cancel()
ticker := time.NewTicker(time.Second * time.Duration(l.lbActiveCheckTick))
defer ticker.Stop()
Expand Down
6 changes: 3 additions & 3 deletions do/loadbalancers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ limitations under the License.
package do

import (
"context"
"errors"
"fmt"
"reflect"
"testing"

"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"

"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -1729,7 +1729,7 @@ func Test_GetLoadBalancer(t *testing.T) {
lb := &loadbalancers{fakeClient, "nyc1", 2, 1}

// we don't actually use clusterName param in GetLoadBalancer
lbStatus, exists, err := lb.GetLoadBalancer("test", test.service)
lbStatus, exists, err := lb.GetLoadBalancer(context.TODO(), "test", test.service)
if !reflect.DeepEqual(lbStatus, test.lbStatus) {
t.Error("unexpected LB status")
t.Logf("expected: %v", test.lbStatus)
Expand Down Expand Up @@ -1963,7 +1963,7 @@ func Test_EnsureLoadBalancer(t *testing.T) {
lb := &loadbalancers{fakeClient, "nyc1", 2, 1}

// clusterName param in EnsureLoadBalancer currently not used
lbStatus, err := lb.EnsureLoadBalancer("test", test.service, test.nodes)
lbStatus, err := lb.EnsureLoadBalancer(context.TODO(), "test", test.service, test.nodes)
if !reflect.DeepEqual(lbStatus, test.lbStatus) {
t.Error("unexpected LB status")
t.Logf("expected: %v", test.lbStatus)
Expand Down
Loading

0 comments on commit 0e41681

Please sign in to comment.