From 4850389b53d3c8b43793acbdc65ed67006567bae Mon Sep 17 00:00:00 2001 From: Max Shaposhnyk Date: Thu, 7 Nov 2024 16:06:24 +0200 Subject: [PATCH 1/2] Temporary fix to norrow the scope of cached TaskRuns to prevent OOMs Signed-off-by: Max Shaposhnyk --- pkg/controller/controller.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index ae4d2eda..12059ab0 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -29,6 +29,7 @@ var ( ) const TaskRunLabel = "tekton.dev/taskRun" +const TaskLabel = "tekton.dev/task" func NewManager(cfg *rest.Config, options ctrl.Options) (ctrl.Manager, error) { // do not check tekton in kcp @@ -81,9 +82,17 @@ func NewManager(cfg *rest.Config, options ctrl.Options) (ctrl.Manager, error) { return nil, lerr } podSelector = podSelector.Add(*podLabels) + + taskrunSelector := labels.NewSelector() + trLabels, lerr := labels.NewRequirement(TaskLabel, selection.In, []string{"buildah-remote-oci-ta", "clean-shared-host", "provision-shared-host", "update-host"}) + if lerr != nil { + return nil, lerr + } + taskrunSelector = taskrunSelector.Add(*trLabels) + options.Cache = cache.Options{ ByObject: map[client.Object]cache.ByObject{ - &pipelinev1.TaskRun{}: {}, + &pipelinev1.TaskRun{}: {Label: taskrunSelector}, &v1.Secret{}: {Label: secretSelector}, &v1.ConfigMap{}: {Label: configMapSelector}, &v1.Pod{}: {Label: podSelector}, From 0b9b0fc302d1dd4b0dadb04b5116425974efc540 Mon Sep 17 00:00:00 2001 From: Max Shaposhnyk Date: Fri, 8 Nov 2024 09:19:49 +0200 Subject: [PATCH 2/2] fixup! Temporary fix to norrow the scope of cached TaskRuns to prevent OOMs --- pkg/controller/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 12059ab0..15c65fec 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -84,7 +84,7 @@ func NewManager(cfg *rest.Config, options ctrl.Options) (ctrl.Manager, error) { podSelector = podSelector.Add(*podLabels) taskrunSelector := labels.NewSelector() - trLabels, lerr := labels.NewRequirement(TaskLabel, selection.In, []string{"buildah-remote-oci-ta", "clean-shared-host", "provision-shared-host", "update-host"}) + trLabels, lerr := labels.NewRequirement(TaskLabel, selection.In, []string{"buildah-remote", "buildah-remote-oci-ta", "clean-shared-host", "provision-shared-host", "update-host"}) if lerr != nil { return nil, lerr }