Skip to content

fix: use cached client for handler to reduce audit log volume #325

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

Draft
kseiter-rh wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −14
Draft

fix: use cached client for handler to reduce audit log volume #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0b4512
fix: use cached client for handler to reduce audit log volume
kseiter-rh Aug 6, 2026
e6f4a97
fix: restrict cache to specific resources with field selectors
kseiter-rh Aug 6, 2026
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
7 changes: 1 addition & 6 deletions controllers/ocmagent/ocmagent_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,12 @@ func (r *OcmAgentReconciler) Reconcile(ctx context.Context, request reconcile.Re
}
}

// Periodically reconcile to check for pull-secret changes
// Since we can't watch openshift-config/pull-secret (due to RBAC/cache issues),
// we reconcile every 5 minutes to detect changes
// Periodically reconcile to detect pull-secret or proxy config drift
return reconcile.Result{RequeueAfter: ctrlconst.SyncPeriodDefault}, nil
}

// SetupWithManager sets up the controller with the Manager.
func (r *OcmAgentReconciler) SetupWithManager(mgr ctrl.Manager) error {
// Note: We use periodic reconciliation instead of watching pull-secret
// due to RBAC/cache issues with openshift-config namespace

return ctrl.NewControllerManagedBy(mgr).
For(&ocmagentv1alpha1.OcmAgent{}).
Owns(&netv1.NetworkPolicy{}).
Expand Down
27 changes: 19 additions & 8 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ import (
// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"

corev1 "k8s.io/api/core/v1"
apiruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/fields"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

Expand Down Expand Up @@ -146,6 +148,22 @@ func main() {
DefaultNamespaces: map[string]cache.Config{
operatorNS: {},
},
ByObject: map[client.Object]cache.ByObject{
&corev1.Secret{}: {
Namespaces: map[string]cache.Config{
"openshift-config": {
FieldSelector: fields.OneTermEqualSelector("metadata.name", "pull-secret"),
},
},
},
&corev1.ConfigMap{}: {
Namespaces: map[string]cache.Config{
"openshift-monitoring": {
FieldSelector: fields.OneTermEqualSelector("metadata.name", "ocm-agent"),
},
},
},
},
},
Scheme: scheme,
Metrics: metricsserver.Options{
Expand All @@ -162,17 +180,10 @@ func main() {
os.Exit(1)
}

// Create a separate client for the OAH Builder
kubeConfig := ctrl.GetConfigOrDie()
handlerClient, err := client.New(kubeConfig, client.Options{Scheme: mgr.GetScheme()})
if err != nil {
os.Exit(1)
}

if err = (&ocmagent.OcmAgentReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
OCMAgentHandlerBuilder: ocmagenthandler.NewBuilder(handlerClient),
OCMAgentHandlerBuilder: ocmagenthandler.NewBuilder(mgr.GetClient()),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "OcmAgent")
os.Exit(1)
Expand Down