Skip to content

OCPBUGS-11565: High API requests due to allowlist and operconfig reconcilers running too often #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
May 4, 2023
Merged

OCPBUGS-11565: High API requests due to allowlist and operconfig reconcilers running too often #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc91921
Update allowlist reconciler to watch specific namespace
donpenney Apr 19, 2023
b418c1e
Update operconfig to only have one recurring reconciler
donpenney Apr 19, 2023
0d04760
Remove allowlist reconciler namespace check
donpenney Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions pkg/controller/allowlist/allowlist_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package allowlist
import (
"context"
"os"
"strings"
"time"

cnoclient "github.com/openshift/cluster-network-operator/pkg/client"
Expand All @@ -17,11 +18,15 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
v1coreinformers "k8s.io/client-go/informers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"

crclient "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"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"
)
Expand All @@ -37,20 +42,35 @@ func Add(mgr manager.Manager, status *statusmanager.StatusManager, c cnoclient.C
return add(mgr, newReconciler(mgr, status, c))
}

func newReconciler(mgr manager.Manager, status *statusmanager.StatusManager, c cnoclient.Client) reconcile.Reconciler {
func newReconciler(mgr manager.Manager, status *statusmanager.StatusManager, c cnoclient.Client) *ReconcileAllowlist {
return &ReconcileAllowlist{client: c, scheme: mgr.GetScheme(), status: status}
}

func add(mgr manager.Manager, r reconcile.Reconciler) error {
func add(mgr manager.Manager, r *ReconcileAllowlist) error {
c, err := controller.New("allowlist-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}
err = c.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, &handler.EnqueueRequestForObject{})
if err != nil {
return err
}
return nil

// watch for changes in all configmaps in our namespace
cmInformer := v1coreinformers.NewConfigMapInformer(
r.client.Default().Kubernetes(),
names.MULTUS_NAMESPACE,
0, // don't resync
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})

r.client.Default().AddCustomInformer(cmInformer) // Tell the ClusterClient about this informer

return c.Watch(&source.Informer{Informer: cmInformer},
&handler.EnqueueRequestForObject{},
predicate.ResourceVersionChangedPredicate{},
predicate.NewPredicateFuncs(func(object crclient.Object) bool {
// Only care about cni-sysctl-allowlist, but also watching for default-cni-sysctl-allowlist
// as a trigger for creating cni-sysctl-allowlist if it doesn't exist
return (strings.Contains(object.GetName(), names.ALLOWLIST_CONFIG_NAME))

}),
)
}

var _ reconcile.Reconciler = &ReconcileAllowlist{}
Expand All @@ -73,9 +93,10 @@ func (r *ReconcileAllowlist) Reconcile(ctx context.Context, request reconcile.Re
return reconcile.Result{}, err
}

if request.Namespace != names.MULTUS_NAMESPACE || request.Name != names.ALLOWLIST_CONFIG_NAME {
if request.Name != names.ALLOWLIST_CONFIG_NAME {
return reconcile.Result{}, nil
}
klog.Infof("Reconcile allowlist for %s/%s", request.Namespace, request.Name)

configMap, err := getConfig(ctx, r.client, request.NamespacedName)
if err != nil {
Expand Down
5 changes: 3 additions & 2 deletions pkg/controller/operconfig/operconfig_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,9 @@ func (r *ReconcileOperConfig) Reconcile(ctx context.Context, request reconcile.R

func reconcileOperConfig(obj crclient.Object) []reconcile.Request {
log.Printf("%s %s/%s changed, triggering operconf reconciliation", obj.GetObjectKind().GroupVersionKind().Kind, obj.GetNamespace(), obj.GetName())
// Update reconcile.Request object to align with unnamespaced default network,
// to ensure we don't have multiple requeueing reconcilers running
return []reconcile.Request{{NamespacedName: types.NamespacedName{
Name: names.OPERATOR_CONFIG,
Namespace: names.APPLIED_NAMESPACE,
Name: names.OPERATOR_CONFIG,
}}}
}