diff --git a/upup/pkg/fi/cloudup/awstasks/dnszone.go b/upup/pkg/fi/cloudup/awstasks/dnszone.go index 69468acbfc..1a70253ad6 100644 --- a/upup/pkg/fi/cloudup/awstasks/dnszone.go +++ b/upup/pkg/fi/cloudup/awstasks/dnszone.go @@ -86,7 +86,7 @@ func (e *DNSZone) findExisting(cloud awsup.AWSCloud) (*route53.HostedZone, error } // Otherwise continue ... maybe the name was not an id after all... } else { - return nil, fmt.Errorf("error fetching DNS HostedZone %q: %v", *e.ID, err) + return nil, fmt.Errorf("error fetching DNS HostedZone %q: %v", findID, err) } } else { return response.HostedZone, nil diff --git a/upup/pkg/fi/cloudup/awstasks/load_balancer.go b/upup/pkg/fi/cloudup/awstasks/load_balancer.go index 5f7de5fe62..c4beea4bd3 100644 --- a/upup/pkg/fi/cloudup/awstasks/load_balancer.go +++ b/upup/pkg/fi/cloudup/awstasks/load_balancer.go @@ -362,9 +362,10 @@ func (_ *LoadBalancer) RenderTerraform(t *terraform.TerraformTarget, a, e, chang elbName = e.Name } + internal := fi.StringValue(e.Scheme) == "internal" tf := &terraformLoadBalancer{ Name: elbName, - Internal: *e.Scheme == "internal", + Internal: internal, } for _, subnet := range e.Subnets { diff --git a/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go b/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go index 815fec02d4..dafc47db09 100644 --- a/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go +++ b/upup/pkg/fi/cloudup/awstasks/load_balancer_attachment.go @@ -100,7 +100,6 @@ func (s *LoadBalancerAttachment) CheckChanges(a, e, changes *LoadBalancerAttachm } func (_ *LoadBalancerAttachment) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *LoadBalancerAttachment) error { - if e.AutoscalingGroup != nil && e.Instance == nil { request := &autoscaling.AttachLoadBalancersInput{} request.AutoScalingGroupName = e.AutoscalingGroup.Name diff --git a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go index 2a78319708..dfb319ad53 100644 --- a/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go +++ b/upup/pkg/fi/cloudup/awstasks/loadbalancer_attributes.go @@ -24,6 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" + "k8s.io/kops/upup/pkg/fi/cloudup/terraform" ) type LoadBalancerAccessLog struct { @@ -250,3 +251,8 @@ func (_ *LoadBalancerAttributes) RenderAWS(t *awsup.AWSAPITarget, a, e, changes return nil } + +func (_ *LoadBalancerAttributes) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *LoadBalancerAttributes) error { + glog.Warning("LoadBalancerAttributes RenderTerraform not implemented") + return nil +}