Allow customize service via service.Override and handle endpoint protocol #332
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ package endpoint | |
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/url" | ||
| "strings" | ||
| "time" | ||
|
|
@@ -50,13 +51,21 @@ type Data struct { | |
| Port int32 | ||
| // An optional path suffix to append to route hostname when forming Keystone endpoint URLs | ||
| Path string | ||
| // protocol of the endpoint (http/https/none) | ||
| Protocol *service.Protocol | ||
| // details for metallb service generation | ||
| // NOTE: (mschuppert) deprecated, can be removed when external endpoint creation moved to openstack-operator | ||
| // and ExposeEndpoints() can be removed | ||
| MetalLB *MetalLBData | ||
| // possible overrides for Route | ||
| // NOTE: (mschuppert) deprecated, can be removed when external endpoint creation moved to openstack-operator | ||
| // and ExposeEndpoints() can be removed | ||
| RouteOverride *route.OverrideSpec | ||
| } | ||
|
|
||
| // MetalLBData - information specific to creating the MetalLB service | ||
| // NOTE: (mschuppert) deprecated, can be removed when external endpoint creation moved to openstack-operator | ||
| // and ExposeEndpoints() can be removed | ||
| type MetalLBData struct { | ||
| // Name of the metallb IpAddressPool | ||
| IPAddressPool string | ||
|
|
@@ -73,12 +82,14 @@ type MetalLBData struct { | |
| } | ||
|
|
||
| // ExposeEndpoints - creates services, routes and returns a map of created openstack endpoint | ||
| // NOTE: (mschuppert) deprecated, can be removed when external endpoint creation moved to openstack-operator | ||
| // and ExposeEndpoints() can be removed | ||
| func ExposeEndpoints( | ||
| ctx context.Context, | ||
| h *helper.Helper, | ||
| serviceName string, | ||
| endpointSelector map[string]string, | ||
| endpoints map[service.Endpoint]Data, | ||
| timeout time.Duration, | ||
| ) (map[string]string, ctrl.Result, error) { | ||
| endpointMap := make(map[string]string) | ||
|
|
@@ -95,6 +106,7 @@ func ExposeEndpoints( | |
|
|
||
| // Create metallb service if specified, otherwise create a route | ||
| var hostname string | ||
| var port string | ||
| if data.MetalLB != nil { | ||
| var protocol corev1.Protocol | ||
| if data.MetalLB.Protocol != nil { | ||
|
|
@@ -105,7 +117,7 @@ func ExposeEndpoints( | |
| } | ||
|
|
||
| // Create the service | ||
| svc, err := service.NewService( | ||
| service.MetalLBService(&service.MetalLBServiceDetails{ | ||
| Name: endpointName, | ||
| Namespace: h.GetBeforeObject().GetNamespace(), | ||
|
|
@@ -117,12 +129,15 @@ func ExposeEndpoints( | |
| Protocol: protocol, | ||
| }, | ||
| }), | ||
| timeout, | ||
| &service.OverrideSpec{}, | ||
| ) | ||
| if err != nil { | ||
| return endpointMap, ctrl.Result{}, err | ||
| } | ||
| annotations := map[string]string{ | ||
| service.MetalLBAddressPoolAnnotation: data.MetalLB.IPAddressPool, | ||
| service.AnnotationHostnameKey: svc.GetServiceHostname(), // add annotation to register service name in dnsmasq | ||
| } | ||
| if len(data.MetalLB.LoadBalancerIPs) > 0 { | ||
| annotations[service.MetalLBLoadBalancerIPs] = strings.Join(data.MetalLB.LoadBalancerIPs, ",") | ||
|
|
@@ -144,11 +159,11 @@ func ExposeEndpoints( | |
| } | ||
| // create service - end | ||
|
|
||
| hostname, port = svc.GetServiceHostnamePort() | ||
| } else { | ||
|
|
||
| // Create the service | ||
| svc, err := service.NewService( | ||
| service.GenericService(&service.GenericServiceDetails{ | ||
| Name: endpointName, | ||
| Namespace: h.GetBeforeObject().GetNamespace(), | ||
|
|
@@ -159,9 +174,13 @@ func ExposeEndpoints( | |
| Port: data.Port, | ||
| Protocol: corev1.ProtocolTCP, | ||
| }}), | ||
| 5, | ||
| &service.OverrideSpec{}, | ||
| ) | ||
| if err != nil { | ||
| return endpointMap, ctrl.Result{}, err | ||
| } | ||
|
|
||
| ctrlResult, err := svc.CreateOrPatch(ctx, h) | ||
| if err != nil { | ||
| return endpointMap, ctrlResult, err | ||
|
|
@@ -170,10 +189,10 @@ func ExposeEndpoints( | |
| } | ||
| // create service - end | ||
|
|
||
| hostname, port = svc.GetServiceHostnamePort() | ||
|
|
||
| // Create the route if it is public endpoint | ||
| if endpointType == service.EndpointPublic { | ||
| // Create the route | ||
| // TODO TLS | ||
| route, err := route.NewRoute( | ||
|
|
@@ -184,7 +203,6 @@ func ExposeEndpoints( | |
| ServiceName: endpointName, | ||
| TargetPortName: endpointName, | ||
| }), | ||
| timeout, | ||
| data.RouteOverride, | ||
|
There was a problem hiding this comment. @stuggi quick question here: when a There was a problem hiding this comment. yes, for TLS-E we terminate at the route and re-encrypt to the service pods. Before you start working on this, we already do initial work for TLS-E in a generic way for all services. So don't start before checking with us because its probably duplicate work. There was a problem hiding this comment. yes, I'll wait to see the first patch series landed, and when doing tls we can sync up and discuss about the Glance use case. We might need to have an additional sidecar container w/ httpd or make it default like it is today in Manila/Cinder. |
||
| ) | ||
|
|
@@ -216,7 +234,8 @@ func ExposeEndpoints( | |
|
|
||
| // Do not include data.Path in parsing check because %(project_id)s | ||
| // is invalid without being encoded, but they should not be encoded in the actual endpoint | ||
| endptURL := fmt.Sprintf("%s://%s:%s", protocol, hostname, port) | ||
| apiEndpoint, err := url.Parse(endptURL) | ||
| if err != nil { | ||
| return endpointMap, ctrl.Result{}, err | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ack, we still have this here but after the whole chain is merged we can do some cleanup.