Upstream rebase to 2.11.2 #14

joelsmith · 2023-09-22T19:35:46Z

Create a rebase tree using rebasebot:

rebasebot --source https://github.com/kedacore/keda:release/v2.11 --dest openshift/keda:main \
          --rebase joelsmith/keda:rebase --tag-policy=strict --update-go-modules --dry-run \
          --github-user-token <(yaml2json ~/.config/hub | jq -r '."github.com"[0].oauth_token')

cd .rebase
Update .ci-operator.yaml and squash into existing carry commit
Copy https://github.com/openshift/custom-metrics-autoscaler-operator/blob/main/hack/cma-verify-history.sh to this repo overwriting old version, edit the repo name, and squash to OpenShift CI carry patch
Clean up carry commits, update OWNERS, squash where appropriate
Add verify history drop commit to use upstream's release/v2.11 branch as the merge base
Push to own fork, open PR

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…4353)

Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>

…by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> * end with star when grabbing regex string from comment body Signed-off-by: gauron99 <fridrich.david19@gmail.com> * Update .github/workflows/pr-e2e.yml Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Signed-off-by: David Fridrich <49119790+gauron99@users.noreply.github.com> --------- Signed-off-by: gauron99 <fridrich.david19@gmail.com> Signed-off-by: David Fridrich <49119790+gauron99@users.noreply.github.com> Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

…ed (kedacore#4361)

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

…dacore#4369) Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

…e#4371)

Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com>

…edacore#4373 Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

* fix: Use explicit parameter for workflow step Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix: Use explicit parameter for workflow step Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> --------- Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

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

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Signed-off-by: gauron99 <fridrich.david19@gmail.com>

Signed-off-by: dttung2905 <ttdao.2015@accountancy.smu.edu.sg>

…id (kedacore#4397) Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com>

Signed-off-by: ithesadson <thesadson@gmail.com>

kedacore#4387) (kedacore#4401) Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Andy Ward <mortx@toothless.eldarrin.io>

…re#4390) Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: jmadajczak <jmadajczak@transparentdata.pl>

Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

…acore#4438 Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>

…4405)

Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

…argetGVKR (kedacore#4722) Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

Signed-off-by: Mathieu Cantin <103442330+mcantinqc@users.noreply.github.com>

…processing deviation (kedacore#4703) Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

…le they are not managed by other ScaledObject (kedacore#4537) Signed-off-by: Ivan Santos <301291+pragmaticivan@users.noreply.github.com>

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

Signed-off-by: Benjamin Herbert <benjamin@herbert.cc>

kedacore#4558) --- Accreditation --- Original PR: kedacore#3828 Borrows from the work originally implemented by: https://github.com/keegancwinchester Note: I would have loved to have pulled the commit from the original branch, but I could not be able to. Documentation MR by original implementor: kedacore/keda-docs#932 --- Fixes --- Fixes # kedacore#3656 --- PR Notes --- Introduce annotation to pause ScaledJobs. Signed-off-by: BenJ <benjamin.jessop@fluxfederation.com> Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com> Co-authored-by: Zbynek Roubalik <zroubalik@gmail.com>

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

Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Indresh2410 <130135623+Indresh2410@users.noreply.github.com> fix: Skip Resolving Secrets From Restricted Namespace (kedacore#4735)

) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Co-authored-by: Joel Smith <joelsmith@users.noreply.github.com>

Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Dao Thanh Tung <ttdao.2015@accountancy.smu.edu.sg> Co-authored-by: Eldarrin <32762846+Eldarrin@users.noreply.github.com> fix `msgBacklogThreshold` field being named wrongly as `msgBacklog` (kedacore#4736) fix: AWS Pod Identity uses default service account if not provided (kedacore#4768) fix: Restore prometheus metrics in Metrics Server (kedacore#4766) fix repo bug (kedacore#4792)

This is used by CPaaS where Cachito will make a cached copy of anything needed during the build so that an offline brew build can succeed.

* hack/cma-verify-history.sh: checks history to make sure to use rebasebot-friendly commit messages

… (rebasebot)

…e/v2.11 branch instead of main

openshift-ci · 2023-09-22T20:14:42Z

@joelsmith: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

joelsmith · 2023-09-22T21:13:11Z

Instruction for reviewer(s):

Compare with upstream (in reverse order): https://github.com/kedacore/keda/commits/release/v2.11
First 116 commits here (9797830..517ed30) are the top 116 there. Beyond verifying that this is the case, no review is required of these commits (already reviewed upstream). Verifying only the commit hash of the most recent commit in both places is sufficient to verify all (as the hash would be different if anything had changed).

Compare the merge commit d811855 to its upstream parent 517ed30 to verify they are identical, showing that the rest of our prior changes are reverted by this merge commit and that we're back to a clean slate, relative to upstream. Here's a link to the diff: 517ed30...d811855 (Files changed: 0)
or you can check out this branch and run git diff 517ed30 d811855 and see that there are no changes.

Verify that remaining commits (prefixed with UPSTREAM:) are all the carry patches re-applied post-rebase and that drop patches are not.
Compare with currently-carried patches (in reverse order): https://github.com/openshift/kedacore-keda/commits/main

joelsmith · 2023-09-22T21:36:39Z

FYI, this PR adds a new UPSTREAM: <drop>: commit, 93acaeb, so that the CI job cma-verify-history will pass. This change will get dropped on the next upstream rebase (and we'll go back to aiming at the main branch.

aravindhp

/lgtm

openshift-ci · 2023-09-22T21:51:05Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp, joelsmith

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [joelsmith]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

renovate bot and others added 30 commits March 13, 2023 08:49

chore(deps): update actions/cache action to v3.3.1 (kedacore#4356)

9797830

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore: use GH_AUTOMATION_PAT instead of GH_AUTOMATIONS_PAT (kedacore#…

ee2f6f7

…4353)

fix(aws-sqs): Respect scaleOnInFlight value (kedacore#4358)

ff4a8a8

Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>

chore: Provide updated roadmap (kedacore#4359)

15dd6c7

chore: update supported versions in the welcome message (kedacore#4360)

d87d113

chore: Add a release step to ensure that supported versions are updat…

32ad669

…ed (kedacore#4361)

Drop a transitive dependency on bou.ke/monkey (kedacore#4366)

7efb66e

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

chore: Execute FOSSA on PRs (kedacore#4367)

00b773c

fix odd number of arguments passed as key-value pairs for logging (ke…

ee61867

…dacore#4369) Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

chore: Upload artifacts in case of failure in main e2e tests (kedacor…

46b3992

…e#4371)

chore: Provide more robust release tracker issue template (kedacore#4375

6bf6ea7

Signed-off-by: Tom Kerkhove <kerkhove.tom@gmail.com>

fix: Use latest image for GH Actions e2e test to avoid agent updates (k…

661d196

…edacore#4373 Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

fix link in the changelog (kedacore#4384)

08f8b46

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

chore(deps): update actions/setup-go action to v4 (kedacore#4385)

6ed564e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

scale to zero with cpu/mem scaler (kedacore#4346)

b1b1be1

Signed-off-by: gauron99 <fridrich.david19@gmail.com>

Fix: broken rendering in create new scaler markdown file

f0e3118

Signed-off-by: dttung2905 <ttdao.2015@accountancy.smu.edu.sg>

chore: fix custom hpa name e2e test (kedacore#4399)

5c65298

fix: Allow to remove the finalizer even if the ScaledObject isn't val…

43789f2

…id (kedacore#4397) Co-authored-by: Tom Kerkhove <kerkhove.tom@gmail.com>

feat(Scaler): Adds Solr Scaler (kedacore#4355)

078c51b

Signed-off-by: ithesadson <thesadson@gmail.com>

fix: Azure Pipelines Scaler uses correct endpoint when demands are set (

04e5742

kedacore#4387) (kedacore#4401) Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Andy Ward <mortx@toothless.eldarrin.io>

feat: Allow scaling using redis stream length (kedacore#4277) (kedaco…

388bf37

…re#4390) Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: jmadajczak <jmadajczak@transparentdata.pl>

fix: add missing labels for aad wi (kedacore#4409)

f5995ba

chore: Improve tests (kedacore#4372)

e979077

Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es> Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>

feat(scaler): make GCP PubSub more flexible (kedacore#4408)

9c46261

fix smoke tests (kedacore#4433)

4605174

fix: Use the previous regex removing the multilines from matches (ked…

d234876

…acore#4438 Signed-off-by: Jorge Turrado <jorge_turrado@hotmail.es>

fix: respect all required demands in azure pipeline scaler (kedacore#…

3dc157b

…4405)

chore: Add v2.10.1 to the bug template (kedacore#4450

c3cc005

Signed-off-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>

zroubalik and others added 12 commits June 21, 2023 16:01

fix: trying to prevent operator crash when accessing SO.Status.ScaleT…

bc92124

…argetGVKR (kedacore#4722) Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

feat: Allow to change the Admission Webhooks port (kedacore#4712)

013b720

Signed-off-by: Mathieu Cantin <103442330+mcantinqc@users.noreply.github.com>

Support ScaledObject taking over existing HPAs with the same name whi…

92e7546

…le they are not managed by other ScaledObject (kedacore#4537) Signed-off-by: Ivan Santos <301291+pragmaticivan@users.noreply.github.com>

bump deps (kedacore#4726)

b753245

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

feat: fix metrics not showing and improve graphs (kedacore#4727)

da2ff6e

Signed-off-by: Benjamin Herbert <benjamin@herbert.cc>

prepare release 2.11.0 (kedacore#4728)

26c3451

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

chore: Cherry-pick fixes for KEDA v2.11.1 (kedacore#4744)

62d90e8

Co-authored-by: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es> Co-authored-by: Indresh2410 <130135623+Indresh2410@users.noreply.github.com> fix: Skip Resolving Secrets From Restricted Namespace (kedacore#4735)

chore: Cherry-pick fixes for KEDA v2.11.1 (kedacore#4744) (kedacore#4752

b8dbd29

) Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> Co-authored-by: Joel Smith <joelsmith@users.noreply.github.com>

merge upstream/release/v2.11 into main

d811855

openshift-ci bot requested a review from rphillips September 22, 2023 19:39

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 22, 2023

joelsmith added 5 commits September 22, 2023 13:41

UPSTREAM: <carry>: Add buildroot file .ci-operator.yaml

8e6607e

UPSTREAM: <carry>: add tooldeps to generate go.mod for build tools

70272f5

This is used by CPaaS where Cachito will make a cached copy of anything needed during the build so that an offline brew build can succeed.

UPSTREAM: <carry>: Add OpenShift-specific CI tests

369c45c

* hack/cma-verify-history.sh: checks history to make sure to use rebasebot-friendly commit messages

UPSTREAM: <carry>: add OWNERS file

cb42643

UPSTREAM: <carry>: Update and vendor go modules after upstream rebase…

9491522

… (rebasebot)

joelsmith force-pushed the rebase branch from cf1cd5a to 9491522 Compare September 22, 2023 19:57

UPSTREAM: <drop>: update CI history check script to go back to releas…

93acaeb

…e/v2.11 branch instead of main

joelsmith changed the title ~~Rebase to upstream 2.11.2~~ Upstream rebase to 2.11.2 Sep 22, 2023

aravindhp approved these changes Sep 22, 2023

View reviewed changes

openshift-ci bot assigned aravindhp Sep 22, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2023

openshift-merge-robot merged commit acae035 into openshift:main Sep 22, 2023
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream rebase to 2.11.2 #14

Upstream rebase to 2.11.2 #14

joelsmith commented Sep 22, 2023 •

edited

openshift-ci bot commented Sep 22, 2023

joelsmith commented Sep 22, 2023 •

edited

joelsmith commented Sep 22, 2023

aravindhp left a comment

openshift-ci bot commented Sep 22, 2023

Upstream rebase to 2.11.2 #14

Upstream rebase to 2.11.2 #14

Conversation

joelsmith commented Sep 22, 2023 • edited

openshift-ci bot commented Sep 22, 2023

joelsmith commented Sep 22, 2023 • edited

joelsmith commented Sep 22, 2023

aravindhp left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Sep 22, 2023

joelsmith commented Sep 22, 2023 •

edited

joelsmith commented Sep 22, 2023 •

edited