Skip to content

terminationObserver: use lister instead of direct client calls #1885

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

terminationObserver: use lister instead of direct client calls #1885

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
terminationObserver := terminationobserver.NewTerminationObserver(
operatorclient.TargetNamespace,
kubeInformersForNamespaces.InformersFor(operatorclient.TargetNamespace),
kubeClient.CoreV1(),
kubeInformersForNamespaces.PodLister().Pods(operatorclient.TargetNamespace),
controllerContext.EventRecorder,
)

Expand Down
19 changes: 11 additions & 8 deletions pkg/operator/terminationobserver/termination_observer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"time"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
corelisterv1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"
"k8s.io/component-base/metrics"
Expand Down Expand Up @@ -42,7 +42,8 @@ var (
type TerminationObserver struct {
targetNamespace string

podsGetter corev1client.PodsGetter
podsLister corelisterv1.PodNamespaceLister
labelSelector labels.Selector

cachesToSync []cache.InformerSynced
queue workqueue.RateLimitingInterface
Expand Down Expand Up @@ -77,12 +78,12 @@ func RegisterMetrics() {
func NewTerminationObserver(
targetNamespace string,
kubeInformersForTargetNamespace informers.SharedInformerFactory,
podsGetter corev1client.PodsGetter,
podsLister corelisterv1.PodNamespaceLister,
eventRecorder events.Recorder,
) *TerminationObserver {
c := &TerminationObserver{
targetNamespace: targetNamespace,
podsGetter: podsGetter,
podsLister: podsLister,
eventRecorder: eventRecorder.WithComponentSuffix("termination-observer"),
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "TerminationObserver"),
apiServerTerminationTime: map[string]time.Time{},
Expand All @@ -94,19 +95,21 @@ func NewTerminationObserver(
c.cachesToSync = append(c.cachesToSync, kubeInformersForTargetNamespace.Core().V1().Pods().Informer().HasSynced)
c.cachesToSync = append(c.cachesToSync, kubeInformersForTargetNamespace.Core().V1().Events().Informer().HasSynced)

c.labelSelector = labels.SelectorFromSet(labels.Set{"app": "openshift-kube-apiserver"})

return c
}

func (c *TerminationObserver) sync(ctx context.Context) error {
podList, err := c.podsGetter.Pods(c.targetNamespace).List(ctx, metav1.ListOptions{LabelSelector: "app=openshift-kube-apiserver"})
func (c *TerminationObserver) sync(_ context.Context) error {
podList, err := c.podsLister.List(c.labelSelector)
if err != nil {
return fmt.Errorf("unable to list pods in %q namespace: %v", c.targetNamespace, err)
}

c.Lock()
defer c.Unlock()

for _, pod := range podList.Items {
for _, pod := range podList {
// Prevent firing termination logs and metrics for initial observation (we don't know when the API Server was terminated).
if _, exists := c.apiServerTerminationTime[pod.Name]; !exists {
c.apiServerTerminationTime[pod.Name] = pod.CreationTimestamp.Time
Expand Down