Skip to content

Bug 1956609: Bypass cache when reading Node and Machine objects #121

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 1 commit into from
May 26, 2021
Merged

Bug 1956609: Bypass cache when reading Node and Machine objects #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import (
machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
"github.com/openshift/cluster-machine-approver/pkg/controller"
"github.com/openshift/cluster-machine-approver/pkg/metrics"
corev1 "k8s.io/api/core/v1"
control "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
ctrl "sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/manager"

Expand Down Expand Up @@ -78,10 +80,25 @@ func main() {
klog.Fatal("unable to add Machines to scheme")
}

// Prevent the controller from caching node and machine objects.
// Stale nodes and machines can cause the approver to not approve certificates
// within a timely manner, leading to failed node bootstraps.
approverClient, err := client.NewDelegatingClient(client.NewDelegatingClientInput{
Client: mgr.GetClient(),
CacheReader: mgr.GetClient(),
UncachedObjects: []client.Object{
&machinev1.Machine{},
&corev1.Node{},
},
})
if err != nil {
klog.Fatalf("unable to set up delegating client: %v", err)
}

// Setup all Controllers
klog.Info("setting up controllers")
if err = (&controller.CertificateApprover{
Client: mgr.GetClient(),
Client: approverClient,
RestCfg: mgr.GetConfig(),
Config: controller.LoadConfig(cliConfig),
}).SetupWithManager(mgr, ctrl.Options{}); err != nil {
Expand Down