Skip to content

Commit

Permalink
Merge pull request #28 from andrewsykim/vendor-v1.8
Browse files Browse the repository at this point in the history
update vendor for kubernetes v1.8
  • Loading branch information
andrewsykim committed Sep 27, 2017
2 parents e186e82 + 41525dd commit af87dc4
Show file tree
Hide file tree
Showing 3,189 changed files with 533,508 additions and 841,843 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 4 additions & 0 deletions do/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,7 @@ func (c *cloud) ProviderName() string {
func (c *cloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []string) {
return nil, nil
}

func (c *cloud) HasClusterID() bool {
return false
}
8 changes: 7 additions & 1 deletion do/droplets.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"net/http"
"strconv"

"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/cloudprovider"

"github.com/digitalocean/godo"
Expand Down Expand Up @@ -131,6 +131,12 @@ func (i *instances) CurrentNodeName(hostname string) (types.NodeName, error) {
return types.NodeName(hostname), nil
}

// InstanceExistsByProviderID returns true if the instance for the given provider id still is running.
// If false is returned with no error, the instance will be immediately deleted by the cloud controller manager.
func (i *instances) InstanceExistsByProviderID(providerID string) (bool, error) {
return false, nil
}

// dropletById returns the godo Droplet type corresponding to the provided id
func (i *instances) dropletById(ctx context.Context, id string) (*godo.Droplet, error) {
intId, err := strconv.Atoi(id)
Expand Down
2 changes: 1 addition & 1 deletion do/droplets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"reflect"
"testing"

"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"

"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"
Expand Down
2 changes: 1 addition & 1 deletion do/loadbalancers.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/cloudprovider"

"github.com/digitalocean/godo"
Expand Down
2 changes: 1 addition & 1 deletion do/loadbalancers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/digitalocean/godo"
"github.com/digitalocean/godo/context"

"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
)

type fakeLBService struct {
Expand Down
13 changes: 12 additions & 1 deletion do/zones.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package do

import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/cloudprovider"
)

Expand All @@ -28,8 +29,18 @@ func newZones(region string) cloudprovider.Zones {
return zones{region}
}

// GetZone returns a cloudprovider.Zone
// GetZone returns a cloudprovider.Zone for the currently running node
// GetZone will only fill the Region field of cloudprovider.Zone for DO
func (z zones) GetZone() (cloudprovider.Zone, error) {
return cloudprovider.Zone{Region: z.region}, nil
}

// GetZoneByProviderID returns the zone for a node given its providerID
func (z zones) GetZoneByProviderID(providerID string) (cloudprovider.Zone, error) {
return cloudprovider.Zone{}, nil
}

// GetZoneByNodeName returns the zone for a node given its node name
func (z zones) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Zone, error) {
return cloudprovider.Zone{}, nil
}
12 changes: 3 additions & 9 deletions vendor/cloud.google.com/go/compute/metadata/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions vendor/cloud.google.com/go/internal/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions vendor/github.com/Azure/azure-sdk-for-go/arm/compute/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 38 additions & 30 deletions vendor/github.com/Azure/azure-sdk-for-go/arm/compute/availabilitysets.go
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit af87dc4

Please sign in to comment.