[BUG-5656] Annotate Jobs with parent ScaledJob generation #5876

josefkarasek · 2024-06-10T14:43:03Z

As reported in #5656, keda-operator Pod restart causes the deletion of existing Jobs (child resources of ScaledJob). The Jobs are re-created immediately, but the state/progress of the running Jobs is lost.

My approach to fixing this is to maintain relation between the ScaledJob and child Jobs using an Annotation:
"scaledjob.keda.sh/generation": $(ScaledJob.Generation)
This way the operator, during startup, will only delete Jobs with "scaledjob.keda.sh/generation" that doesn't match the generation of the parent ScaledJob.

Checklist

When introducing a new scaler, I agree with the scaling governance policy
I have verified that my change is according to the deprecations & breaking changes policy
Tests have been added
Changelog has been updated and is aligned with our changelog requirements
A PR is opened to update our Helm chart (repo) (if applicable, ie. when deployment manifests are modified)
A PR is opened to update the documentation on (repo) (if applicable)
Commits are signed with Developer Certificate of Origin (DCO - learn more)

Fixes #5656

zroubalik

Looking good, thanks! Could you please also update changelog?

pkg/scaling/executor/scale_jobs.go

zroubalik · 2024-06-25T19:49:39Z

/run-e2e internal
Update: You can check the progress here

zroubalik

@josefkarasek the static check si failing on the Changelog entry, it needs to be alphabetically sorted, also please move this into Improvements section - it is an user-facing issue.

The rest looks good, thanks

Signed-off-by: Josef Karasek <josef@kedify.io>

zroubalik · 2024-07-30T10:40:52Z

/run-e2e internal
Update: You can check the progress here

Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

) * Annotate Jobs with parent ScaledJob generation Signed-off-by: Josef Karasek <josef@kedify.io> * fix tests Signed-off-by: Josef Karasek <josef@kedify.io> * fix lint Signed-off-by: Josef Karasek <josef@kedify.io> * fix log message Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> --------- Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com>

) * Annotate Jobs with parent ScaledJob generation Signed-off-by: Josef Karasek <josef@kedify.io> * fix tests Signed-off-by: Josef Karasek <josef@kedify.io> * fix lint Signed-off-by: Josef Karasek <josef@kedify.io> * fix log message Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> --------- Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>

* bump golang Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * chore: build with keda-tools:1.22.5 (#5971) * chore: build with keda-tools:1.22.5 to resolve CVE-2024-24790, CVE-2024-24789, and CVE-2024-24791 bump github.com/Azure/azure-sdk-for-go/sdk/azidentity to resolve CVE-2024-35255 Signed-off-by: Paul Yu <paul.d.yu@gmail.com> * chore: use go install instead of go get and replacing deprecated tools Signed-off-by: Paul Yu <paul.d.yu@gmail.com> * chore: vendor dependency cleanup Signed-off-by: Paul Yu <paul.d.yu@gmail.com> * Update missing references to 1.21 Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> --------- Signed-off-by: Paul Yu <paul.d.yu@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * [BUG-5922] Report failing ScaledJob triggers in status (#5916) Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * [BUG-5656] Annotate Jobs with parent ScaledJob generation (#5876) * Annotate Jobs with parent ScaledJob generation Signed-off-by: Josef Karasek <josef@kedify.io> * fix tests Signed-off-by: Josef Karasek <josef@kedify.io> * fix lint Signed-off-by: Josef Karasek <josef@kedify.io> * fix log message Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> --------- Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix: `+srv` mongodb url scheme parsing bug (#5773) This commit fixs issue #5760. where OP was facing problem with +srv schema Signed-off-by: Rishikesh Betigeri <53863619+Rishikesh01@users.noreply.github.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix: issue when GitHub organization contains more than 30 repos (#5746) Signed-off-by: Simon Kobler <github@kobler.me> Signed-off-by: Simon Kobler <32038731+KoblerS@users.noreply.github.com> Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Simon Kobler <github@kobler.me> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * Fix scaler leak during cache refresh (#5807) Signed-off-by: Guillaume Jacquet <guillaume.jacquet@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * Prepare release v2.14.1 Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * add missing change Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * update changelog Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix: e2e test regex check tag (#5831) Signed-off-by: Jan Wozniak <wozniak.jan@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * Validate regex before building image for e2e test (#5783) * added regex pre check before building image Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * updated changelog Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * refactored Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * corrected Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * corrected changelog Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * updated the workflow Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * updated the workflow Signed-off-by: Yaxhveer <yaxhcod@gmail.com> --------- Signed-off-by: Yaxhveer <yaxhcod@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix some pending tasks Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * use AAD-Pod-Identity always Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * use AAD-Pod-Identity always Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> --------- Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Paul Yu <paul.d.yu@gmail.com> Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Rishikesh Betigeri <53863619+Rishikesh01@users.noreply.github.com> Signed-off-by: Simon Kobler <github@kobler.me> Signed-off-by: Simon Kobler <32038731+KoblerS@users.noreply.github.com> Signed-off-by: Guillaume Jacquet <guillaume.jacquet@gmail.com> Signed-off-by: Jan Wozniak <wozniak.jan@gmail.com> Signed-off-by: Yaxhveer <yaxhcod@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Co-authored-by: Paul Yu <paul.d.yu@gmail.com> Co-authored-by: Josef Karasek <josef@kedify.io> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Rishikesh <53863619+Rishikesh01@users.noreply.github.com> Co-authored-by: Simon Kobler <32038731+KoblerS@users.noreply.github.com> Co-authored-by: Simon Kobler <github@kobler.me> Co-authored-by: Guillaume Jacquet <guillaume.jacquet@gmail.com> Co-authored-by: Jan Wozniak <wozniak.jan@gmail.com> Co-authored-by: Yashveer <101015836+Yaxhveer@users.noreply.github.com>

* bump golang Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * chore: build with keda-tools:1.22.5 (kedacore#5971) * chore: build with keda-tools:1.22.5 to resolve CVE-2024-24790, CVE-2024-24789, and CVE-2024-24791 bump github.com/Azure/azure-sdk-for-go/sdk/azidentity to resolve CVE-2024-35255 Signed-off-by: Paul Yu <paul.d.yu@gmail.com> * chore: use go install instead of go get and replacing deprecated tools Signed-off-by: Paul Yu <paul.d.yu@gmail.com> * chore: vendor dependency cleanup Signed-off-by: Paul Yu <paul.d.yu@gmail.com> * Update missing references to 1.21 Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> --------- Signed-off-by: Paul Yu <paul.d.yu@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * [BUG-5922] Report failing ScaledJob triggers in status (kedacore#5916) Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * [BUG-5656] Annotate Jobs with parent ScaledJob generation (kedacore#5876) * Annotate Jobs with parent ScaledJob generation Signed-off-by: Josef Karasek <josef@kedify.io> * fix tests Signed-off-by: Josef Karasek <josef@kedify.io> * fix lint Signed-off-by: Josef Karasek <josef@kedify.io> * fix log message Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> --------- Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix: `+srv` mongodb url scheme parsing bug (kedacore#5773) This commit fixs issue kedacore#5760. where OP was facing problem with +srv schema Signed-off-by: Rishikesh Betigeri <53863619+Rishikesh01@users.noreply.github.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix: issue when GitHub organization contains more than 30 repos (kedacore#5746) Signed-off-by: Simon Kobler <github@kobler.me> Signed-off-by: Simon Kobler <32038731+KoblerS@users.noreply.github.com> Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Simon Kobler <github@kobler.me> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * Fix scaler leak during cache refresh (kedacore#5807) Signed-off-by: Guillaume Jacquet <guillaume.jacquet@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * Prepare release v2.14.1 Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * add missing change Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * update changelog Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix: e2e test regex check tag (kedacore#5831) Signed-off-by: Jan Wozniak <wozniak.jan@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * Validate regex before building image for e2e test (kedacore#5783) * added regex pre check before building image Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * updated changelog Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * refactored Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * corrected Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * corrected changelog Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * updated the workflow Signed-off-by: Yaxhveer <yaxhcod@gmail.com> * updated the workflow Signed-off-by: Yaxhveer <yaxhcod@gmail.com> --------- Signed-off-by: Yaxhveer <yaxhcod@gmail.com> Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * fix some pending tasks Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> * use AAD-Pod-Identity always Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * use AAD-Pod-Identity always Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> --------- Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Paul Yu <paul.d.yu@gmail.com> Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Rishikesh Betigeri <53863619+Rishikesh01@users.noreply.github.com> Signed-off-by: Simon Kobler <github@kobler.me> Signed-off-by: Simon Kobler <32038731+KoblerS@users.noreply.github.com> Signed-off-by: Guillaume Jacquet <guillaume.jacquet@gmail.com> Signed-off-by: Jan Wozniak <wozniak.jan@gmail.com> Signed-off-by: Yaxhveer <yaxhcod@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Co-authored-by: Paul Yu <paul.d.yu@gmail.com> Co-authored-by: Josef Karasek <josef@kedify.io> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Rishikesh <53863619+Rishikesh01@users.noreply.github.com> Co-authored-by: Simon Kobler <32038731+KoblerS@users.noreply.github.com> Co-authored-by: Simon Kobler <github@kobler.me> Co-authored-by: Guillaume Jacquet <guillaume.jacquet@gmail.com> Co-authored-by: Jan Wozniak <wozniak.jan@gmail.com> Co-authored-by: Yashveer <101015836+Yaxhveer@users.noreply.github.com>

) * Annotate Jobs with parent ScaledJob generation Signed-off-by: Josef Karasek <josef@kedify.io> * fix tests Signed-off-by: Josef Karasek <josef@kedify.io> * fix lint Signed-off-by: Josef Karasek <josef@kedify.io> * fix log message Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> * update changelog Signed-off-by: Josef Karasek <josef@kedify.io> --------- Signed-off-by: Josef Karasek <josef@kedify.io> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

josefkarasek marked this pull request as ready for review June 17, 2024 09:15

josefkarasek requested a review from a team as a code owner June 17, 2024 09:15

josefkarasek changed the title ~~Annotate Jobs with parent ScaledJob generation~~ [BUG-5656] Annotate Jobs with parent ScaledJob generation Jun 17, 2024

zroubalik reviewed Jun 24, 2024

View reviewed changes

pkg/scaling/executor/scale_jobs.go Outdated Show resolved Hide resolved

josefkarasek force-pushed the bug-5656 branch from 84311c7 to c44795a Compare June 25, 2024 14:38

This comment was marked as outdated.

Sign in to view

zroubalik reviewed Jun 25, 2024

View reviewed changes

zroubalik self-requested a review June 25, 2024 19:51

josefkarasek added 6 commits June 26, 2024 11:24

Annotate Jobs with parent ScaledJob generation

74e80dd

Signed-off-by: Josef Karasek <josef@kedify.io>

fix tests

fee15c4

Signed-off-by: Josef Karasek <josef@kedify.io>

fix lint

245f46f

Signed-off-by: Josef Karasek <josef@kedify.io>

fix log message

b805cfd

Signed-off-by: Josef Karasek <josef@kedify.io>

update changelog

7cd8a7b

Signed-off-by: Josef Karasek <josef@kedify.io>

update changelog

ae2d1a1

Signed-off-by: Josef Karasek <josef@kedify.io>

josefkarasek force-pushed the bug-5656 branch from c1b19ae to ae2d1a1 Compare June 26, 2024 09:25

update changelog

16e9190

Signed-off-by: Josef Karasek <josef@kedify.io>

zroubalik approved these changes Jul 30, 2024

View reviewed changes

Merge branch 'main' into bug-5656

080b49b

Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

zroubalik merged commit 7ca6708 into kedacore:main Jul 30, 2024
16 checks passed

JorTurFer mentioned this pull request Jul 30, 2024

Release: v2.14.1 #6002

Closed

23 tasks

joelsmith mentioned this pull request Aug 1, 2024

OCPBUGS-36001: PODAUTO-204: Upstream rebase to 2.14.0 openshift/kedacore-keda#32

Merged

miteshbsjat mentioned this pull request Oct 13, 2024

KEDA deleting Job objects unnecessarily during startup #6233

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[BUG-5656] Annotate Jobs with parent ScaledJob generation #5876

[BUG-5656] Annotate Jobs with parent ScaledJob generation #5876

josefkarasek commented Jun 10, 2024 •

edited

Loading

zroubalik left a comment

zroubalik commented Jun 25, 2024 •

edited by github-actions bot

Loading

This comment was marked as outdated.

zroubalik left a comment

zroubalik commented Jul 30, 2024 •

edited by github-actions bot

Loading

[BUG-5656] Annotate Jobs with parent ScaledJob generation #5876

[BUG-5656] Annotate Jobs with parent ScaledJob generation #5876

Conversation

josefkarasek commented Jun 10, 2024 • edited Loading

Checklist

zroubalik left a comment

Choose a reason for hiding this comment

zroubalik commented Jun 25, 2024 • edited by github-actions bot Loading

This comment was marked as outdated.

zroubalik left a comment

Choose a reason for hiding this comment

zroubalik commented Jul 30, 2024 • edited by github-actions bot Loading

josefkarasek commented Jun 10, 2024 •

edited

Loading

zroubalik commented Jun 25, 2024 •

edited by github-actions bot

Loading

zroubalik commented Jul 30, 2024 •

edited by github-actions bot

Loading