oauthendpoints: use separate resync intervals for each EndpointAccess…

…ibleController
openshift · Nov 9, 2023 · 78cce05 · 78cce05
1 parent b50b977
commit 78cce05
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkg/controllers/oauthendpoints/oauth_endpoints_controller.go b/pkg/controllers/oauthendpoints/oauth_endpoints_controller.go
@@ -6,8 +6,10 @@ import (
 	"fmt"
 	"net"
 	"strconv"
+	"time"
 
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/klog/v2"
 
 	corev1 "k8s.io/api/core/v1"
@@ -65,7 +67,8 @@ func NewOAuthRouteCheckController(
 			routeInformer,
 			ingressInformer,
 		},
-		recorder)
+		recorder,
+		wait.Jitter(5*time.Minute, 0.1))
 }
 
 // NewOAuthServiceCheckController returns a controller that checks the health of authentication service.
@@ -90,7 +93,8 @@ func NewOAuthServiceCheckController(
 			kubeInformersForTargetNS.Core().V1().ConfigMaps().Informer(),
 			kubeInformersForTargetNS.Core().V1().Services().Informer(),
 		},
-		recorder)
+		recorder,
+		wait.Jitter(time.Minute, 1.0))
 }
 
 // NewOAuthServiceEndpointsCheckController returns a controller that checks the health of authentication service
@@ -116,7 +120,8 @@ func NewOAuthServiceEndpointsCheckController(
 			kubeInformersForTargetNS.Core().V1().Endpoints().Informer(),
 			kubeInformersForTargetNS.Core().V1().ConfigMaps().Informer(),
 		},
-		recorder)
+		recorder,
+		wait.Jitter(time.Minute, 1.0))
 }
 
 func listOAuthServiceEndpoints(endpointsLister corev1listers.EndpointsLister) ([]string, error) {

diff --git a/pkg/libs/endpointaccessible/endpoint_accessible_controller.go b/pkg/libs/endpointaccessible/endpoint_accessible_controller.go
@@ -11,7 +11,6 @@ import (
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/apimachinery/pkg/util/wait"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
 	"github.com/openshift/library-go/pkg/controller/factory"
@@ -38,6 +37,7 @@ func NewEndpointAccessibleController(
 	getTLSConfigFn EndpointTLSConfigFunc,
 	triggers []factory.Informer,
 	recorder events.Recorder,
+	resyncInterval time.Duration,
 ) factory.Controller {
 	controllerName := name + "EndpointAccessibleController"
 
@@ -52,7 +52,7 @@ func NewEndpointAccessibleController(
 		WithInformers(triggers...).
 		WithInformers(operatorClient.Informer()).
 		WithSync(c.sync).
-		ResyncEvery(wait.Jitter(time.Minute, 1.0)).
+		ResyncEvery(resyncInterval).
 		WithSyncDegradedOnError(operatorClient).
 		ToController(controllerName, recorder.WithComponentSuffix(name+"endpoint-accessible-controller"))
 }