Skip to content

Commit

Permalink
oauthendpoints: filter only relevant configmaps and secrets to the OA…
Browse files Browse the repository at this point in the history
…uthRouteCheckController
  • Loading branch information
liouk committed Oct 5, 2023
1 parent 706cbbe commit 9f5a0d4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
13 changes: 13 additions & 0 deletions pkg/controllers/oauthendpoints/oauth_endpoints_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@ func NewOAuthRouteCheckController(
return getOAuthRouteTLSConfig(cmLister, secretLister, ingressLister, systemCABundle)
}

filterFunc := factory.NamesFilter(
// NS: openshift-authentication
"oauth-openshift",
"v4-0-config-system-router-certs",
"v4-0-config-system-custom-router-certs",

// NS: openshift-config-managed
"default-ingress-cert",
)

return endpointaccessible.NewEndpointAccessibleController(
"OAuthServerRoute",
operatorClient,
Expand All @@ -67,6 +77,7 @@ func NewOAuthRouteCheckController(
routeInformer,
ingressInformer,
},
filterFunc,
recorder,
wait.Jitter(time.Minute, 5.0))
}
Expand All @@ -93,6 +104,7 @@ func NewOAuthServiceCheckController(
kubeInformersForTargetNS.Core().V1().ConfigMaps().Informer(),
kubeInformersForTargetNS.Core().V1().Services().Informer(),
},
nil,
recorder,
wait.Jitter(time.Minute, 1.0))
}
Expand Down Expand Up @@ -120,6 +132,7 @@ func NewOAuthServiceEndpointsCheckController(
kubeInformersForTargetNS.Core().V1().Endpoints().Informer(),
kubeInformersForTargetNS.Core().V1().ConfigMaps().Informer(),
},
nil,
recorder,
wait.Jitter(time.Minute, 1.0))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ func NewEndpointAccessibleController(
endpointListFn EndpointListFunc,
getTLSConfigFn EndpointTLSConfigFunc,
triggers []factory.Informer,
triggersFilterFunc factory.EventFilterFunc,
recorder events.Recorder,
resyncInterval time.Duration,
) factory.Controller {
Expand All @@ -49,7 +50,7 @@ func NewEndpointAccessibleController(
}

return factory.New().
WithInformers(triggers...).
WithFilteredEventsInformers(triggersFilterFunc, triggers...).
WithInformers(operatorClient.Informer()).
WithSync(c.sync).
ResyncEvery(resyncInterval).
Expand Down

0 comments on commit 9f5a0d4

Please sign in to comment.