Skip to content

CNTRLPLANE-3380: Add rebasebot periodics for HyperShift dependency repos#79306

Open
bryan-cox wants to merge 3 commits into
openshift:mainfrom
bryan-cox:add-rebasebot-periodics
Open

CNTRLPLANE-3380: Add rebasebot periodics for HyperShift dependency repos#79306
bryan-cox wants to merge 3 commits into
openshift:mainfrom
bryan-cox:add-rebasebot-periodics

Conversation

@bryan-cox
Copy link
Copy Markdown
Member

@bryan-cox bryan-cox commented May 14, 2026

Summary

  • Adds rebasebot periodic jobs for three HyperShift dependency repos, using the same HyperShift Rebase Bot GitHub App (ID: 3706026) and credentials as the existing apiserver-network-proxy job from CNTRLPLANE-3380: Add rebasebot periodic for openshift/apiserver-network-proxy #79284
  • New jobs run Mon/Thu at 12:00 UTC:
    • aws-encryption-provider: rebases openshift/aws-encryption-provider:master onto kubernetes-sigs/aws-encryption-provider:master
    • aws-node-termination-handler: rebases openshift/aws-node-termination-handler:main onto aws/aws-node-termination-handler:main
    • azure-kubernetes-kms: rebases openshift/azure-kubernetes-kms:main onto Azure/kubernetes-kms:master

Test plan

  • Verify periodic jobs appear in Prow after merge
  • Verify first automated rebase PRs are created on each repo

/cc @openshift/hypershift-team

🤖 Generated with Claude Code

… aws-node-termination-handler, azure-kubernetes-kms

Configure rebasebot to automatically rebase these three HyperShift
dependency repos onto their upstream sources on Mon/Thu:
- openshift/aws-encryption-provider from kubernetes-sigs/aws-encryption-provider:master
- openshift/aws-node-termination-handler from aws/aws-node-termination-handler:main
- openshift/azure-kubernetes-kms from Azure/kubernetes-kms:master

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 14, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented May 14, 2026

@bryan-cox: This pull request references CNTRLPLANE-3380 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Adds rebasebot periodic jobs for three HyperShift dependency repos, using the same HyperShift Rebase Bot GitHub App (ID: 3706026) and credentials as the existing apiserver-network-proxy job from CNTRLPLANE-3380: Add rebasebot periodic for openshift/apiserver-network-proxy #79284
  • New jobs run Mon/Thu at 12:00 UTC:
  • aws-encryption-provider: rebases openshift/aws-encryption-provider:master onto kubernetes-sigs/aws-encryption-provider:master
  • aws-node-termination-handler: rebases openshift/aws-node-termination-handler:main onto aws/aws-node-termination-handler:main
  • azure-kubernetes-kms: rebases openshift/azure-kubernetes-kms:main onto Azure/kubernetes-kms:master

Test plan

  • Verify periodic jobs appear in Prow after merge
  • Verify first automated rebase PRs are created on each repo

/cc @openshift/hypershift-team

🤖 Generated with Claude Code

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

@bryan-cox: GitHub didn't allow me to request PR reviews from the following users: openshift/hypershift-team.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

Summary

  • Adds rebasebot periodic jobs for three HyperShift dependency repos, using the same HyperShift Rebase Bot GitHub App (ID: 3706026) and credentials as the existing apiserver-network-proxy job from CNTRLPLANE-3380: Add rebasebot periodic for openshift/apiserver-network-proxy #79284
  • New jobs run Mon/Thu at 12:00 UTC:
  • aws-encryption-provider: rebases openshift/aws-encryption-provider:master onto kubernetes-sigs/aws-encryption-provider:master
  • aws-node-termination-handler: rebases openshift/aws-node-termination-handler:main onto aws/aws-node-termination-handler:main
  • azure-kubernetes-kms: rebases openshift/azure-kubernetes-kms:main onto Azure/kubernetes-kms:master

Test plan

  • Verify periodic jobs appear in Prow after merge
  • Verify first automated rebase PRs are created on each repo

/cc @openshift/hypershift-team

🤖 Generated with Claude Code

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-sigs/prow repository.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 14, 2026

Walkthrough

Adds three scheduled rebasebot test jobs to the OpenShift CI rebasebot config and adds a commitchecker base image plus a verify-commits test step to four repository CI configs (apiserver-network-proxy, aws-encryption-provider, aws-node-termination-handler, azure-kubernetes-kms).

Changes

Scheduled rebasebot jobs

Layer / File(s) Summary
Rebasebot job entries
ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml
Adds three tests[] entries: aws-encryption-provider, aws-node-termination-handler, azure-kubernetes-kms. Each is a scheduled rebasebot run (0 12 * * Mon,Thu) targeting the respective upstream repo/ref and openshift/* destination branch, enables --update-go-modules, mounts /secrets/rebasebot via hypershift-rebasebot-credentials, and sets resource requests/limits (400m CPU request, 1Gi memory request, 6Gi memory limit).

Commit checker verification step

Layer / File(s) Summary
Base image declaration
ci-operator/config/openshift/.../openshift-*-main.yaml, ci-operator/config/openshift/.../openshift-*-master.yaml
Adds base_images.commitchecker entries (name: commitchecker, namespace: ci, tag: latest) where missing.
verify-commits test step
ci-operator/config/openshift/apiserver-network-proxy/openshift-apiserver-network-proxy-main.yaml, ci-operator/config/openshift/aws-encryption-provider/openshift-aws-encryption-provider-master.yaml, ci-operator/config/openshift/aws-node-termination-handler/openshift-aws-node-termination-handler-main.yaml, ci-operator/config/openshift/azure-kubernetes-kms/openshift-azure-kubernetes-kms-main.yaml
Adds a tests[] entry as: verify-commits that runs commitchecker --start ${PULL_BASE_SHA:-<branch>} inside a container from: commitchecker (branch default varies: main or master as in each file). No other pipeline steps or resources changed.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

  • openshift/release#79284: Also modifies ci-operator/config/openshift-eng/rebasebot/openshift-eng-rebasebot-main.yaml to add scheduled rebasebot entries.

Suggested labels

lgtm, approved, rehearsals-ack

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately and specifically summarizes the main change: adding rebasebot periodic jobs for HyperShift dependency repositories.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies only YAML CI configuration files. No Ginkgo test definitions (It(), Describe(), Context(), etc.) are present in the changes. The check is not applicable.
Test Structure And Quality ✅ Passed PR contains only CI/CD configuration files (YAML), not Ginkgo test code. Custom check requires reviewing Ginkgo test code, which is not applicable here.
Microshift Test Compatibility ✅ Passed No Ginkgo e2e tests were added. PR modifies only CI YAML config files for rebasebot periodic jobs and verify-commits steps. MicroShift compatibility check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR contains only CI/automation YAML configuration changes. No new Ginkgo e2e tests are present. The check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI/test configuration only (no scheduling constraints found). Check applies to deployment manifests/operator code, not CI infrastructure.
Ote Binary Stdout Contract ✅ Passed PR contains only YAML CI configuration changes with no test binary or Go code modifications. OTE Binary Stdout Contract check is not applicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR contains no new Ginkgo e2e tests. Changes are CI configuration YAML files (rebasebot periodic jobs and commitchecker validation). Check is not applicable.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@bryan-cox
Copy link
Copy Markdown
Member Author

/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-azure-kubernetes-kms

@bryan-cox
Copy link
Copy Markdown
Member Author

/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-aws-encryption-provider

@bryan-cox
Copy link
Copy Markdown
Member Author

/pj-rehearse periodic-ci-openshift-eng-rebasebot-main-aws-node-termination-handler

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@bryan-cox: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

1 similar comment
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@bryan-cox: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@bryan-cox: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

bryan-cox and others added 2 commits May 14, 2026 12:07
…ebot repos

Adds a verify-commits presubmit test using the commitchecker tool to
validate commit message format (UPSTREAM: <carry|drop|PR#>) on PRs for
apiserver-network-proxy, aws-encryption-provider,
aws-node-termination-handler, and azure-kubernetes-kms.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bryan-cox
Once this PR has been reviewed and has the lgtm label, please assign elmiko for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

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

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@bryan-cox: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-eng-rebasebot-main-aws-node-termination-handler N/A periodic Periodic changed
periodic-ci-openshift-eng-rebasebot-main-azure-kubernetes-kms N/A periodic Periodic changed
periodic-ci-openshift-eng-rebasebot-main-aws-encryption-provider N/A periodic Periodic changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 14, 2026

@bryan-cox: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants