Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

shiftstack-merge-bot · shiftstack-merge-bot · commit ca1c47e22b6c · 2022-10-13T12:19:44.000Z
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -1951,7 +1951,7 @@ func (lbaas *LbaasV2) createLoadBalancerStatus(service *corev1.Service, svcConf
 	// https://github.com/kubernetes/enhancements/tree/master/keps/sig-network/1860-kube-proxy-IP-node-binding
 	// is implemented (maybe in v1.22).
 	if svcConf.enableProxyProtocol && lbaas.opts.EnableIngressHostname {
-		fakeHostname := fmt.Sprintf("%s.%s", status.Ingress[0].IP, lbaas.opts.IngressHostnameSuffix)
+		fakeHostname := fmt.Sprintf("%s.%s", addr, lbaas.opts.IngressHostnameSuffix)
 		status.Ingress = []corev1.LoadBalancerIngress{{Hostname: fakeHostname}}
 		return status
 	}

Original file line number	Diff line number	Diff line change
`@@ -1951,7 +1951,7 @@ func (lbaas LbaasV2) createLoadBalancerStatus(service corev1.Service, svcConf`
`1951`	`1951`	`// https://github.com/kubernetes/enhancements/tree/master/keps/sig-network/1860-kube-proxy-IP-node-binding`
`1952`	`1952`	`// is implemented (maybe in v1.22).`
`1953`	`1953`	`if svcConf.enableProxyProtocol && lbaas.opts.EnableIngressHostname {`
`1954`		`- fakeHostname := fmt.Sprintf("%s.%s", status.Ingress[0].IP, lbaas.opts.IngressHostnameSuffix)`
	`1954`	`+ fakeHostname := fmt.Sprintf("%s.%s", addr, lbaas.opts.IngressHostnameSuffix)`
`1955`	`1955`	`status.Ingress = []corev1.LoadBalancerIngress{{Hostname: fakeHostname}}`
`1956`	`1956`	`return status`
`1957`	`1957`	`}`