mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #49697 from zetaab/mfloating
Automatic merge from submit-queue (batch tested with PRs 47416, 47408, 49697, 49860, 50162) add possibility to use multiple floatingip pools in openstack loadbalancer **What this PR does / why we need it**: Currently only one floating pool is supported in kubernetes openstack cloud provider. It is quite big issue for us, because we want run only single kubernetes cluster, but we want that external and internal services can be used. It means that we need possibility to create services with internal and external pools. **Which issue this PR fixes**: fixes #49147 **Special notes for your reviewer**: service labels is not maybe correct place to define this floatingpool id. However, I did not find any better place easily. I do not want start modifying service api structure. **Release note**: ```release-note Add possibility to use multiple floatingip pools in openstack loadbalancer ``` Example how it works: ``` cat /etc/kubernetes/cloud-config [Global] auth-url=https://xxxx username=xxxx password=xxxx region=yyy tenant-id=b23efb65b1d44b5abd561511f40c565d domain-name=foobar [LoadBalancer] lb-version=v2 subnet-id=aed26269-cd01-4d4e-b0d8-9ec726c4c2ba lb-method=ROUND_ROBIN floating-network-id=56e523e7-76cb-477f-80e4-2dc8cf32e3b4 create-monitor=yes monitor-delay=10s monitor-timeout=2000s monitor-max-retries=3 ``` ``` apiVersion: apps/v1beta1 kind: Deployment metadata: name: nginx-deployment spec: replicas: 1 template: metadata: labels: run: web spec: containers: - name: nginx image: nginx ports: - containerPort: 80 --- apiVersion: v1 kind: Service metadata: labels: run: web-ext name: web-ext namespace: default spec: selector: run: web ports: - port: 80 name: https protocol: TCP targetPort: 80 type: LoadBalancer --- apiVersion: v1 kind: Service metadata: labels: run: web-int floatingPool: a2a84887-4915-42bf-aaff-2b76688a4ec7 name: web-int namespace: default spec: selector: run: web ports: - port: 80 name: https protocol: TCP targetPort: 80 type: LoadBalancer ``` ``` % kubectl create -f example.yaml deployment "nginx-deployment" created service "web-ext" created service "web-int" created % kubectl get svc -o wide NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE SELECTOR kubernetes 10.254.0.1 <none> 443/TCP 2m <none> web-ext 10.254.23.153 192.168.1.57,193.xx.xxx.xxx 80:30151/TCP 52s run=web web-int 10.254.128.141 192.168.1.58,10.222.130.80 80:32431/TCP 52s run=web ``` cc @anguslees @k8s-sig-openstack-feature-requests @dims
This commit is contained in:
commit
c3f4dba513
@ -66,6 +66,8 @@ const (
|
||||
|
||||
activeStatus = "ACTIVE"
|
||||
errorStatus = "ERROR"
|
||||
|
||||
ServiceAnnotationLoadBalancerFloatingNetworkId = "loadbalancer.openstack.org/floating-network-id"
|
||||
)
|
||||
|
||||
// LoadBalancer implementation for LBaaS v1
|
||||
@ -581,6 +583,21 @@ func nodeAddressForLB(node *v1.Node) (string, error) {
|
||||
return addrs[0].Address, nil
|
||||
}
|
||||
|
||||
//getStringFromServiceAnnotation searches a given v1.Service for a specific annotationKey and either returns the annotation's value or a specified defaultSetting
|
||||
func getStringFromServiceAnnotation(service *v1.Service, annotationKey string, defaultSetting string) string {
|
||||
glog.V(4).Infof("getStringFromServiceAnnotation(%v, %v, %v)", service, annotationKey, defaultSetting)
|
||||
if annotationValue, ok := service.Annotations[annotationKey]; ok {
|
||||
//if there is an annotation for this setting, set the "setting" var to it
|
||||
// annotationValue can be empty, it is working as designed
|
||||
// it makes possible for instance provisioning loadbalancer without floatingip
|
||||
glog.V(4).Infof("Found a Service Annotation: %v = %v", annotationKey, annotationValue)
|
||||
return annotationValue
|
||||
}
|
||||
//if there is no annotation, set "settings" var to the value from cloud config
|
||||
glog.V(4).Infof("Could not find a Service Annotation; falling back on cloud-config setting: %v = %v", annotationKey, defaultSetting)
|
||||
return defaultSetting
|
||||
}
|
||||
|
||||
// TODO: This code currently ignores 'region' and always creates a
|
||||
// loadbalancer in only the current OpenStack region. We should take
|
||||
// a list of regions (from config) and query/create loadbalancers in
|
||||
@ -598,6 +615,9 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
|
||||
return nil, fmt.Errorf("no ports provided to openstack load balancer")
|
||||
}
|
||||
|
||||
floatingPool := getStringFromServiceAnnotation(apiService, ServiceAnnotationLoadBalancerFloatingNetworkId, lbaas.opts.FloatingNetworkId)
|
||||
glog.V(4).Infof("EnsureLoadBalancer using floatingPool: %v", floatingPool)
|
||||
|
||||
// Check for TCP protocol on each port
|
||||
// TODO: Convert all error messages to use an event recorder
|
||||
for _, port := range ports {
|
||||
@ -827,10 +847,10 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(clusterName string, apiService *v1.Serv
|
||||
if err != nil && err != ErrNotFound {
|
||||
return nil, fmt.Errorf("Error getting floating ip for port %s: %v", portID, err)
|
||||
}
|
||||
if floatIP == nil && lbaas.opts.FloatingNetworkId != "" {
|
||||
if floatIP == nil && floatingPool != "" {
|
||||
glog.V(4).Infof("Creating floating ip for loadbalancer %s port %s", loadbalancer.ID, portID)
|
||||
floatIPOpts := floatingips.CreateOpts{
|
||||
FloatingNetworkID: lbaas.opts.FloatingNetworkId,
|
||||
FloatingNetworkID: floatingPool,
|
||||
PortID: portID,
|
||||
}
|
||||
floatIP, err = floatingips.Create(lbaas.network, floatIPOpts).Extract()
|
||||
|
Loading…
Reference in New Issue
Block a user