mirror of https://github.com/kubernetes/kops.git
Merge pull request #14888 from zetaab/fixingresstatus
Fix ingress status for loadbalancers that does not have publicname
This commit is contained in:
commit
4b66b5b72c
|
|
@ -717,11 +717,14 @@ func getApiIngressStatus(c OpenstackCloud, cluster *kops.Cluster) ([]fi.ApiIngre
|
|||
|
||||
func getLoadBalancerIngressStatus(c OpenstackCloud, cluster *kops.Cluster) ([]fi.ApiIngressStatus, error) {
|
||||
var ingresses []fi.ApiIngressStatus
|
||||
lbName := "api." + cluster.Name
|
||||
if cluster.Spec.API.PublicName != "" {
|
||||
lbName = cluster.Spec.API.PublicName
|
||||
}
|
||||
// Note that this must match OpenstackModel lb name
|
||||
klog.V(2).Infof("Querying Openstack to find Loadbalancers for API (%q)", cluster.Name)
|
||||
lbList, err := c.ListLBs(loadbalancers.ListOpts{
|
||||
Name: cluster.Spec.API.PublicName,
|
||||
Name: lbName,
|
||||
})
|
||||
if err != nil {
|
||||
return ingresses, fmt.Errorf("GetApiIngressStatus: Failed to list openstack loadbalancers: %v", err)
|
||||
|
|
@ -742,7 +745,7 @@ func getLoadBalancerIngressStatus(c OpenstackCloud, cluster *kops.Cluster) ([]fi
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ingresses, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue