Conditionally apply IngressRouteTCP #396
Merged
Conversation
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
EvanHStanton
commented
Dec 6, 2023
| @@ -61,6 +66,41 @@ fn generate_ingress( | |||
| } | |||
| } | |||
|
|
|||
| fn generate_ingress_tcp( | |||
There was a problem hiding this comment.
New function for generating IngressRouteTCP.
EvanHStanton
commented
Dec 6, 2023
| @@ -168,6 +200,11 @@ pub fn generate_ingress_routes( | |||
| for route in routings.iter() { | |||
| match route.ingress_path.clone() { | |||
| Some(path) => { | |||
| if route.entry_points.clone()?.contains(&"ferretdb".to_string()) { | |||
There was a problem hiding this comment.
If the entry point contains "ferretdb" then the ingress route will not be generated.
ianstanton
reviewed
Dec 6, 2023
| @@ -270,8 +271,24 @@ pub async fn reconcile_postgres_ing_route_tcp( | |||
| // Check for all existing IngressRouteTCPs in this namespace | |||
| // Filter out any that are not for this DB or do not have the correct prefix | |||
| for ingress_route_tcp in &ingress_route_tcps { | |||
There was a problem hiding this comment.
There was some conflict between ingress reconciliation in this file and in app services, so we added some logic for ignoring ingress with label component: appService
ianstanton
reviewed
Dec 6, 2023
ianstanton
reviewed
Dec 6, 2023
Comment on lines
+3070
to
+3071
| let app_1_pod = pod_list.items[0].clone(); | ||
| let app_1_container = app_1_pod.spec.unwrap().containers[0].clone(); |
There was a problem hiding this comment.
Order of the apps changed after introducing a new app (ferretdb)
EvanHStanton
requested review from
sjmiller609,
nhudson and
ChuckHend
as code owners
ChuckHend
reviewed
Dec 6, 2023
ChuckHend
reviewed
Dec 6, 2023
ChuckHend
reviewed
Dec 6, 2023
ChuckHend
approved these changes
Dec 6, 2023
sjmiller609
reviewed
Dec 6, 2023
sjmiller609
approved these changes
Dec 7, 2023
ianstanton
approved these changes
Dec 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Routing Configuration Enhancements (types.rs):
entry_pointsandingress_typeto theRoutingstructentry_points= websecure), (ingress_type= http)Ingress Route TCP Implementation (ingress.rs):
generate_ingress_tcpfunction.reconcile_ingress_tcpfunctionapply_ingress_route_tcpasynchronous function for applying TCP ingress routes.App Service Resource Management (manager.rs):
AppServiceResourcesstruct to include ingress_tcp_routes, entry_points, and entry_points_tcp.generate_resourcefunction to fetch entry points from routing configuration.reconcile_app_servicesfunction to incorporate desired entry points in the ingress reconciliation process.