Skip to content

use direct read on first get of system #484

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
stiidk merged 2 commits into from
Jun 6, 2025
Merged

use direct read on first get of system #484

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
b9254f2
use direct read on first get of system
bdjgs Jun 4, 2025
ed715b7
Merge branch 'master' into use-api-reader
stiidk Jun 6, 2025
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
13 changes: 7 additions & 6 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,13 @@ func main() {
}

r1 := &controllers.SystemReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Styra: styraClient,
Recorder: mgr.GetEventRecorderFor("system-controller"),
Metrics: systemMetrics,
Config: ctrlConfig,
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Styra: styraClient,
Recorder: mgr.GetEventRecorderFor("system-controller"),
Metrics: systemMetrics,
Config: ctrlConfig,
APIReader: mgr.GetAPIReader(),
}

if ctrlConfig.NotificationWebhooks != nil && ctrlConfig.NotificationWebhooks.SystemDatasourceChanged != "" {
Expand Down
4 changes: 3 additions & 1 deletion internal/controller/styra/system_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ type SystemReconcilerMetrics struct {
// SystemReconciler reconciles a System object
type SystemReconciler struct {
client.Client
APIReader client.Reader
Scheme *runtime.Scheme
Styra styra.ClientInterface
WebhookClient webhook.Client
Expand All @@ -98,7 +99,7 @@ func (r *SystemReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr

log.Info("Fetching System")
var system v1beta1.System
if err := r.Get(ctx, req.NamespacedName, &system); err != nil {
if err := r.APIReader.Get(ctx, req.NamespacedName, &system); err != nil {
if k8serrors.IsNotFound(err) {
log.Info("Could not find System in kubernetes")
r.Metrics.ReconcileTime.WithLabelValues("delete").Observe(time.Since(start).Seconds())
Expand Down Expand Up @@ -135,6 +136,7 @@ func (r *SystemReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
}

if err != nil {
log.Error(err, "Reconciliation failed")
r.recordErrorEvent(&system, err)
r.setSystemStatusError(&system, err)

Expand Down
2 changes: 2 additions & 0 deletions test/integration/controller/controller_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ var _ = ginkgo.BeforeSuite(func() {
webhookMock = &webhookmocks.Client{}
systemReconciler := styractrls.SystemReconciler{
Client: k8sClient,
APIReader: k8sManager.GetAPIReader(),
Scheme: k8sManager.GetScheme(),
Styra: styraClientMock,
WebhookClient: webhookMock,
Expand Down Expand Up @@ -202,6 +203,7 @@ var _ = ginkgo.BeforeSuite(func() {
//Controller with PodRestart enabled for SLPs.
systemReconcilerPodRestart := styractrls.SystemReconciler{
Client: k8sClient,
APIReader: k8sManagerPodRestart.GetAPIReader(),
Scheme: k8sManagerPodRestart.GetScheme(),
Styra: styraClientMock,
WebhookClient: webhookMock,
Expand Down
Loading