kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Incorporate further review comments

This commit is contained in:
Srikanth 2020-02-02 20:22:17 +05:30
parent e440397548
commit d8a9470aa4
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
upup/pkg/fi/cloudup/dotasks/loadbalancer.go
View File

@ -49,17 +49,19 @@ func (lb *LoadBalancer) CompareWithID() *string {
} }
func (lb *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) { func (lb *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) {
if fi.StringValue(lb.ID) == "" {
// Loadbalancer = nil if not found
return nil, nil
}
cloud := c.Cloud.(*digitalocean.Cloud) cloud := c.Cloud.(*digitalocean.Cloud)
lbService := cloud.LoadBalancers() lbService := cloud.LoadBalancers()
if fi.StringValue(lb.ID) != "" {
loadbalancer, _, err := lbService.Get(context.TODO(), fi.StringValue(lb.ID)) loadbalancer, _, err := lbService.Get(context.TODO(), fi.StringValue(lb.ID))
if err != nil { if err != nil {
return nil, fmt.Errorf("load balancer service get request returned error %v", err) return nil, fmt.Errorf("load balancer service get request returned error %v", err)
} }
// do another check to double-sure we are talking to the right load balancer.
return &LoadBalancer{ return &LoadBalancer{
Name: fi.String(loadbalancer.Name), Name: fi.String(loadbalancer.Name),
ID: fi.String(loadbalancer.ID), ID: fi.String(loadbalancer.ID),
@ -68,10 +70,6 @@ func (lb *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) {
}, nil }, nil
} }
// Loadbalancer = nil if not found
return nil, nil
}
func (lb *LoadBalancer) Run(c *fi.Context) error { func (lb *LoadBalancer) Run(c *fi.Context) error {
return fi.DefaultDeltaRunMethod(lb, c) return fi.DefaultDeltaRunMethod(lb, c)
} }
@ -166,10 +164,9 @@ func (lb *LoadBalancer) FindIPAddress(c *fi.Context) (*string, error) {
return &address, nil return &address, nil
} }
klog.Errorf("Error fetching IP Address for lb Name=%s", fi.StringValue(lb.Name)) const lbWaitTime = 10 * time.Second
time.Sleep(10 * time.Second) klog.Warningf("IP address for LB %s not yet available -- sleeping %s", fi.StringValue(lb.Name), lbWaitTime)
time.Sleep(lbWaitTime)
klog.V(10).Infof("Sleeping for 10 seconds")
return nil, errors.New("IP Address is still empty.") return nil, errors.New("IP Address is still empty.")
} }
@ -183,6 +180,3 @@ func isIPv4(host string) bool {
return ip.To4() != nil return ip.To4() != nil
} }
// terraformVolume represents the digitalocean_volume resource in terraform
// Todo: later.