-
Notifications
You must be signed in to change notification settings - Fork 464
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
…#6991) * Add documentation * Reconcile on NetworkPolicy add events * Compare the entire NetworkPolicy spec to determine changes * Add integration tests * Switch network policy reconciler to native controller-runtime controller * Address PR review feedback * Add hostnameresolver to manager and watch events * Address PR review feedback
- Loading branch information
1 parent
6c60ccc
commit 0f08132
Showing
16 changed files
with
834 additions
and
381 deletions.
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,152 @@ | ||
| // Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file | ||
| // | ||
| // 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 networkpolicy | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| corev1 "k8s.io/api/core/v1" | ||
| networkingv1 "k8s.io/api/networking/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/utils/pointer" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/cluster" | ||
| "sigs.k8s.io/controller-runtime/pkg/controller" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
|
|
||
| v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" | ||
| "github.com/gardener/gardener/pkg/controllerutils/mapper" | ||
| predicateutils "github.com/gardener/gardener/pkg/controllerutils/predicate" | ||
| "github.com/gardener/gardener/pkg/gardenlet/controller/networkpolicy/helper" | ||
| "github.com/gardener/gardener/pkg/gardenlet/controller/networkpolicy/hostnameresolver" | ||
| ) | ||
|
|
||
| // ControllerName is the name of this controller. | ||
| const ControllerName = "networkpolicy" | ||
|
|
||
| // AddToManager adds Reconciler to the given manager. | ||
| func (r *Reconciler) AddToManager(mgr manager.Manager, seedCluster cluster.Cluster) error { | ||
| if r.SeedClient == nil { | ||
| r.SeedClient = seedCluster.GetClient() | ||
| } | ||
| if r.Resolver == nil { | ||
| resolver, err := hostnameresolver.CreateForCluster(seedCluster.GetConfig(), mgr.GetLogger()) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get hostnameresolver: %w", err) | ||
| } | ||
| resolverUpdate := make(chan event.GenericEvent) | ||
| resolver.WithCallback(func() { | ||
| resolverUpdate <- event.GenericEvent{} | ||
| }) | ||
| if err := mgr.Add(resolver); err != nil { | ||
| return fmt.Errorf("failed to add hostnameresolver to manager: %w", err) | ||
| } | ||
| r.Resolver = resolver | ||
| r.ResolverUpdate = resolverUpdate | ||
| } | ||
| if r.ResolverUpdate == nil { | ||
| r.ResolverUpdate = make(chan event.GenericEvent) | ||
| } | ||
| if r.GardenNamespace == "" { | ||
| r.GardenNamespace = v1beta1constants.GardenNamespace | ||
| } | ||
| if r.IstioSystemNamespace == "" { | ||
| r.IstioSystemNamespace = v1beta1constants.IstioSystemNamespace | ||
| } | ||
|
|
||
| // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up | ||
| // the controller manually. | ||
| c, err := controller.New( | ||
| ControllerName, | ||
| mgr, | ||
| controller.Options{ | ||
| Reconciler: r, | ||
| MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), | ||
| RecoverPanic: true, | ||
| }, | ||
| ) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := c.Watch( | ||
| source.NewKindWithCache(&corev1.Namespace{}, seedCluster.GetCache()), | ||
| &handler.EnqueueRequestForObject{}, | ||
| predicateutils.ForEventTypes(predicateutils.Create, predicateutils.Update), | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := c.Watch( | ||
| source.NewKindWithCache(&corev1.Endpoints{}, seedCluster.GetCache()), | ||
| mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapToNamespaces), mapper.UpdateWithNew, mgr.GetLogger()), | ||
| r.IsKubernetesEndpoint(), | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := c.Watch( | ||
| source.NewKindWithCache(&networkingv1.NetworkPolicy{}, seedCluster.GetCache()), | ||
| mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapObjectToNamespace), mapper.UpdateWithNew, mgr.GetLogger()), | ||
| predicateutils.HasName(helper.AllowToSeedAPIServer), | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return c.Watch( | ||
| &source.Channel{Source: r.ResolverUpdate}, | ||
| mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapToNamespaces), mapper.UpdateWithNew, mgr.GetLogger()), | ||
| ) | ||
| } | ||
|
|
||
| // MapToNamespaces is a mapper function which returns requests for all shoot namespaces + garden namespace + istio-system namespace. | ||
| func (r *Reconciler) MapToNamespaces(ctx context.Context, log logr.Logger, _ client.Reader, _ client.Object) []reconcile.Request { | ||
| namespaces := &corev1.NamespaceList{} | ||
| if err := r.SeedClient.List(ctx, namespaces, &client.ListOptions{ | ||
| LabelSelector: shootNamespaceSelector, | ||
| }); err != nil { | ||
| log.Error(err, "Unable to list Shoot namespace for updating NetworkPolicy", "networkPolicyName", helper.AllowToSeedAPIServer) | ||
| return []reconcile.Request{} | ||
| } | ||
|
|
||
| requests := []reconcile.Request{ | ||
| {NamespacedName: types.NamespacedName{Name: r.GardenNamespace}}, | ||
| {NamespacedName: types.NamespacedName{Name: r.IstioSystemNamespace}}, | ||
| } | ||
| for _, namespace := range namespaces.Items { | ||
| requests = append(requests, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&namespace)}) | ||
| } | ||
|
|
||
| return requests | ||
| } | ||
|
|
||
| // MapObjectToNamespace is a mapper function which maps an object to its namespace. | ||
| func (r *Reconciler) MapObjectToNamespace(_ context.Context, _ logr.Logger, _ client.Reader, obj client.Object) []reconcile.Request { | ||
| return []reconcile.Request{{NamespacedName: types.NamespacedName{Name: obj.GetNamespace()}}} | ||
| } | ||
|
|
||
| // IsKubernetesEndpoint returns a predicate which evaluates if the object is the kubernetes endpoint. | ||
| func (r *Reconciler) IsKubernetesEndpoint() predicate.Predicate { | ||
| return predicate.NewPredicateFuncs(func(obj client.Object) bool { | ||
| return obj.GetNamespace() == corev1.NamespaceDefault && obj.GetName() == "kubernetes" | ||
| }) | ||
| } |
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,140 @@ | ||
| // Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file | ||
| // | ||
| // 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 networkpolicy_test | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| corev1 "k8s.io/api/core/v1" | ||
| networkingv1 "k8s.io/api/networking/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/client-go/kubernetes/scheme" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
|
|
||
| v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" | ||
| . "github.com/gardener/gardener/pkg/gardenlet/controller/networkpolicy" | ||
| ) | ||
|
|
||
| var _ = Describe("Add", func() { | ||
| var ( | ||
| reconciler *Reconciler | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| reconciler = &Reconciler{ | ||
| GardenNamespace: v1beta1constants.GardenNamespace, | ||
| IstioSystemNamespace: v1beta1constants.IstioSystemNamespace, | ||
| } | ||
| }) | ||
|
|
||
| Describe("#MapToNamespaces", func() { | ||
| var ( | ||
| ctx = context.TODO() | ||
| log = logr.Discard() | ||
| fakeClient client.Client | ||
| shootNamespace *corev1.Namespace | ||
| fooNamespace *corev1.Namespace | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| fakeClient = fakeclient.NewClientBuilder().WithScheme(scheme.Scheme).Build() | ||
| reconciler.SeedClient = fakeClient | ||
|
|
||
| shootNamespace = &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "shoot--bar", | ||
| Labels: map[string]string{v1beta1constants.GardenRole: v1beta1constants.GardenRoleShoot}}, | ||
| } | ||
| fooNamespace = &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} | ||
| }) | ||
|
|
||
| It("should return a request with the shoot, gardener and istio-system namespaces' names", func() { | ||
| Expect(fakeClient.Create(ctx, shootNamespace)).To(Succeed()) | ||
| Expect(fakeClient.Create(ctx, fooNamespace)).To(Succeed()) | ||
| Expect(reconciler.MapToNamespaces(ctx, log, nil, nil)).To(ConsistOf( | ||
| reconcile.Request{NamespacedName: types.NamespacedName{Name: reconciler.GardenNamespace}}, | ||
| reconcile.Request{NamespacedName: types.NamespacedName{Name: reconciler.IstioSystemNamespace}}, | ||
| reconcile.Request{NamespacedName: types.NamespacedName{Name: "shoot--bar"}}, | ||
| )) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("#MapObjectToNamespace", func() { | ||
| var ( | ||
| ctx = context.TODO() | ||
| log = logr.Discard() | ||
| networkpolicy *networkingv1.NetworkPolicy | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| networkpolicy = &networkingv1.NetworkPolicy{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "foo", | ||
| Namespace: "bar", | ||
| }, | ||
| } | ||
| }) | ||
|
|
||
| It("should return a request with the namespace's name", func() { | ||
| Expect(reconciler.MapObjectToNamespace(ctx, log, nil, networkpolicy)).To(ConsistOf( | ||
| reconcile.Request{NamespacedName: types.NamespacedName{Name: networkpolicy.Namespace}}, | ||
| )) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("#IsKubernetesEndpoint", func() { | ||
| var ( | ||
| p predicate.Predicate | ||
| endpoint *corev1.Endpoints | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| p = reconciler.IsKubernetesEndpoint() | ||
| endpoint = &corev1.Endpoints{ObjectMeta: metav1.ObjectMeta{Namespace: "default", Name: "kubernetes"}} | ||
| }) | ||
|
|
||
| It("should return true because the endpoint is the Kubernetes endpoint", func() { | ||
| Expect(p.Create(event.CreateEvent{Object: endpoint})).To(BeTrue()) | ||
| Expect(p.Update(event.UpdateEvent{ObjectNew: endpoint})).To(BeTrue()) | ||
| Expect(p.Delete(event.DeleteEvent{Object: endpoint})).To(BeTrue()) | ||
| Expect(p.Generic(event.GenericEvent{Object: endpoint})).To(BeTrue()) | ||
| }) | ||
|
|
||
| It("should return false because the endpoint is not the Kubernetes endpoint", func() { | ||
| endpoint.Name = "foo" | ||
|
|
||
| Expect(p.Create(event.CreateEvent{Object: endpoint})).To(BeFalse()) | ||
| Expect(p.Update(event.UpdateEvent{ObjectNew: endpoint})).To(BeFalse()) | ||
| Expect(p.Delete(event.DeleteEvent{Object: endpoint})).To(BeFalse()) | ||
| Expect(p.Generic(event.GenericEvent{Object: endpoint})).To(BeFalse()) | ||
| }) | ||
|
|
||
| It("should return false because the endpoint is a Kubernetes endpoint in a different namespace", func() { | ||
| endpoint.Namespace = "bar" | ||
|
|
||
| Expect(p.Create(event.CreateEvent{Object: endpoint})).To(BeFalse()) | ||
| Expect(p.Update(event.UpdateEvent{ObjectNew: endpoint})).To(BeFalse()) | ||
| Expect(p.Delete(event.DeleteEvent{Object: endpoint})).To(BeFalse()) | ||
| Expect(p.Generic(event.GenericEvent{Object: endpoint})).To(BeFalse()) | ||
| }) | ||
| }) | ||
| }) |
Oops, something went wrong.