EventHandling: Gateway/HTTPRoute/GRPCRoute resource changes enqueue events for attached IAMAuthPolicy/AccessLogPolicy resource #438
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
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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package eventhandlers | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "sigs.k8s.io/gateway-api/apis/v1alpha2" | ||
|
|
||
| "github.com/aws/aws-application-networking-k8s/pkg/k8s" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| ) | ||
|
|
||
| type grpcRouteEventHandler struct { | ||
| log gwlog.Logger | ||
| client client.Client | ||
| mapper *resourceMapper | ||
| } | ||
|
|
||
| func NewGRPCRouteEventHandler(log gwlog.Logger, client client.Client) *grpcRouteEventHandler { | ||
| return &grpcRouteEventHandler{log: log, client: client, | ||
| mapper: &resourceMapper{log: log, client: client}} | ||
| } | ||
|
|
||
| func (h *grpcRouteEventHandler) MapToIAMAuthPolicies() handler.EventHandler { | ||
|
There was a problem hiding this comment. I would like to have a test code for this, easier way to test is extract logic into method level so that you can refer to it outside There was a problem hiding this comment. I have unit tests for |
||
| return handler.EnqueueRequestsFromMapFunc(func(obj client.Object) []reconcile.Request { | ||
| var requests []reconcile.Request | ||
| if route, ok := obj.(*v1alpha2.GRPCRoute); ok { | ||
| policies := h.mapper.GRPCRouteToIAMAuthPolicies(context.Background(), route) | ||
| for _, p := range policies { | ||
| h.log.Infof("GRPCRoute [%s/%s] resource change triggers IAMAuthPolicy [%s/%s] resource change", route.Namespace, route.Name, p.Namespace, p.Name) | ||
| requests = append(requests, reconcile.Request{NamespacedName: k8s.NamespacedName(p)}) | ||
| } | ||
| } | ||
| return requests | ||
| }) | ||
| } | ||
|
|
||
| func (h *grpcRouteEventHandler) MapToAccessLogPolicies() handler.EventHandler { | ||
| return handler.EnqueueRequestsFromMapFunc(func(obj client.Object) []reconcile.Request { | ||
| var requests []reconcile.Request | ||
| if route, ok := obj.(*v1alpha2.GRPCRoute); ok { | ||
| policies := h.mapper.GRPCRouteToAccessLogPolicies(context.Background(), route) | ||
| for _, p := range policies { | ||
| h.log.Infof("GRPCRoute [%s/%s] resource change triggers AccessLogPolicy [%s/%s] resource change", route.Namespace, route.Name, p.Namespace, p.Name) | ||
| requests = append(requests, reconcile.Request{NamespacedName: k8s.NamespacedName(p)}) | ||
| } | ||
| } | ||
| return requests | ||
| }) | ||
| } | ||
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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package eventhandlers | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "sigs.k8s.io/gateway-api/apis/v1beta1" | ||
|
|
||
| "github.com/aws/aws-application-networking-k8s/pkg/k8s" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| ) | ||
|
|
||
| type httpRouteEventHandler struct { | ||
| log gwlog.Logger | ||
| client client.Client | ||
| mapper *resourceMapper | ||
| } | ||
|
|
||
| func NewHTTPRouteEventHandler(log gwlog.Logger, client client.Client) *httpRouteEventHandler { | ||
| return &httpRouteEventHandler{log: log, client: client, | ||
| mapper: &resourceMapper{log: log, client: client}} | ||
| } | ||
|
|
||
| func (h *httpRouteEventHandler) MapToIAMAuthPolicies() handler.EventHandler { | ||
| return handler.EnqueueRequestsFromMapFunc(func(obj client.Object) []reconcile.Request { | ||
| var requests []reconcile.Request | ||
| if route, ok := obj.(*v1beta1.HTTPRoute); ok { | ||
| policies := h.mapper.HTTPRouteToIAMAuthPolicies(context.Background(), route) | ||
| for _, p := range policies { | ||
| h.log.Infof("HTTPRoute [%s/%s] resource change triggers IAMAuthPolicy [%s/%s] resource change", route.Namespace, route.Name, p.Namespace, p.Name) | ||
| requests = append(requests, reconcile.Request{NamespacedName: k8s.NamespacedName(p)}) | ||
| } | ||
| } | ||
| return requests | ||
| }) | ||
| } | ||
|
|
||
| func (h *httpRouteEventHandler) MapToAccessLogPolicies() handler.EventHandler { | ||
| return handler.EnqueueRequestsFromMapFunc(func(obj client.Object) []reconcile.Request { | ||
| var requests []reconcile.Request | ||
| if route, ok := obj.(*v1beta1.HTTPRoute); ok { | ||
| policies := h.mapper.HTTPRouteToAccessLogPolicies(context.Background(), route) | ||
| for _, p := range policies { | ||
| h.log.Infof("HTTPRoute [%s/%s] resource change triggers AccessLogPolicy [%s/%s] resource change", route.Namespace, route.Name, p.Namespace, p.Name) | ||
| requests = append(requests, reconcile.Request{NamespacedName: k8s.NamespacedName(p)}) | ||
| } | ||
| } | ||
| return requests | ||
| }) | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| Copyright 2021. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package controllers | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/client-go/tools/record" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| pkg_builder "sigs.k8s.io/controller-runtime/pkg/builder" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
| gwv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" | ||
| gwvv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1" | ||
|
|
||
| "github.com/aws/aws-application-networking-k8s/controllers/eventhandlers" | ||
| anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/aws" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/deploy" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/k8s" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/latticestore" | ||
| lattice_runtime "github.com/aws/aws-application-networking-k8s/pkg/runtime" | ||
| "github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog" | ||
| ) | ||
|
|
||
| const ( | ||
| authPolicyFinalizer = "iamauthpolicy.k8s.aws/resources" | ||
| ) | ||
|
|
||
| type authPolicyReconciler struct { | ||
|
|
||
| log gwlog.Logger | ||
| client client.Client | ||
| scheme *runtime.Scheme | ||
| finalizerManager k8s.FinalizerManager | ||
| eventRecorder record.EventRecorder | ||
| cloud aws.Cloud | ||
| dataStore *latticestore.LatticeDataStore | ||
| stackMarshaller deploy.StackMarshaller | ||
| } | ||
|
|
||
| func RegisterIAMAuthPolicyController( | ||
| log gwlog.Logger, | ||
| cloud aws.Cloud, | ||
| dataStore *latticestore.LatticeDataStore, | ||
| finalizerManager k8s.FinalizerManager, | ||
| mgr ctrl.Manager, | ||
| ) error { | ||
| k8sClient := mgr.GetClient() | ||
| scheme := mgr.GetScheme() | ||
| evtRec := mgr.GetEventRecorderFor("iamauthpolicy") | ||
|
|
||
| stackMarshaller := deploy.NewDefaultStackMarshaller() | ||
|
|
||
| r := &authPolicyReconciler{ | ||
| log: log, | ||
| client: k8sClient, | ||
| scheme: scheme, | ||
| finalizerManager: finalizerManager, | ||
| eventRecorder: evtRec, | ||
| cloud: cloud, | ||
| stackMarshaller: stackMarshaller, | ||
| dataStore: dataStore, | ||
| } | ||
|
|
||
| gatewayEventHandler := eventhandlers.NewGatewayEventHandler(log, k8sClient) | ||
| httpRouteEventHandler := eventhandlers.NewHTTPRouteEventHandler(log, k8sClient) | ||
| grpcRouteEventHandler := eventhandlers.NewGRPCRouteEventHandler(log, k8sClient) | ||
|
|
||
| builder := ctrl.NewControllerManagedBy(mgr). | ||
| For(&anv1alpha1.IAMAuthPolicy{}, pkg_builder.WithPredicates(predicate.GenerationChangedPredicate{})). | ||
| Watches(&source.Kind{Type: &gwvv1beta1.Gateway{}}, gatewayEventHandler.MapToIAMAuthPolicies(), pkg_builder.WithPredicates(predicate.GenerationChangedPredicate{})). | ||
| Watches(&source.Kind{Type: &gwvv1beta1.HTTPRoute{}}, httpRouteEventHandler.MapToIAMAuthPolicies(), pkg_builder.WithPredicates(predicate.GenerationChangedPredicate{})). | ||
| Watches(&source.Kind{Type: &gwv1alpha2.GRPCRoute{}}, grpcRouteEventHandler.MapToIAMAuthPolicies(), pkg_builder.WithPredicates(predicate.GenerationChangedPredicate{})) | ||
| return builder.Complete(r) | ||
| } | ||
|
|
||
| func (r *authPolicyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
| r.log.Infow("reconcile", "name", req.Name) | ||
| recErr := r.reconcile(ctx, req) | ||
| res, retryErr := lattice_runtime.HandleReconcileError(recErr) | ||
| if res.RequeueAfter != 0 { | ||
| r.log.Infow("requeue request", "name", req.Name, "requeueAfter", res.RequeueAfter) | ||
| } else if res.Requeue { | ||
| r.log.Infow("requeue request", "name", req.Name) | ||
| } else if retryErr == nil { | ||
| r.log.Infow("reconciled", "name", req.Name) | ||
| } | ||
| return res, retryErr | ||
| } | ||
|
|
||
| func (r *authPolicyReconciler) reconcile(ctx context.Context, req ctrl.Request) error { | ||
| //TODO: implement reconcile | ||
| return nil | ||
| } | ||
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.
why can we not do this now?