updates

kubernetes · Sep 28, 2017 · 8086922 · 8086922
1 parent 548a829
commit 8086922
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/pkg/cloudinstances/cloud_instance_group.go b/pkg/cloudinstances/cloud_instance_group.go
@@ -72,6 +72,7 @@ func NewCloudInstanceGroup(groupName string, groupTemplateName string, ig *api.I
 	return cg, nil
 }
 
+// NewCloudInstanceMember creates a new CloudInstanceGroupMember
 func (c *CloudInstanceGroup) NewCloudInstanceMember(instanceId *string, newGroupName string, currentGroupName string, nodeMap map[string]*v1.Node) error {
 	if instanceId == nil {
 		return fmt.Errorf("instance id for cloud instance member cannot be nil")
@@ -96,6 +97,7 @@ func (c *CloudInstanceGroup) NewCloudInstanceMember(instanceId *string, newGroup
 	return nil
 }
 
+// MarkIsReady sets the CloudInstanceGroup status for Ready or NeedsUpdate
 func (c *CloudInstanceGroup) MarkIsReady() {
 	if len(c.NeedUpdate) == 0 {
 		c.Status = "Ready"

diff --git a/pkg/resources/digitalocean/cloud.go b/pkg/resources/digitalocean/cloud.go
@@ -28,10 +28,10 @@ import (
 
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/cloudinstances"
 	"k8s.io/kops/pkg/resources/digitalocean/dns"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
-	"k8s.io/kops/pkg/cloudinstances"
 )
 
 // TokenSource implements oauth2.TokenSource

diff --git a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go
@@ -31,10 +31,10 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/cloudinstances"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	dnsproviderroute53 "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/aws/route53"
-	"k8s.io/kops/pkg/cloudinstances"
 )
 
 type MockAWSCloud struct {

diff --git a/upup/pkg/fi/cloudup/gce/gce_cloud.go b/upup/pkg/fi/cloudup/gce/gce_cloud.go
@@ -27,10 +27,10 @@ import (
 	"google.golang.org/api/storage/v1"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/cloudinstances"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider"
 	"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns"
-	"k8s.io/kops/pkg/cloudinstances"
 )
 
 type GCECloud interface {