Skip to content

WRKLDS-1772: sync release-4.21 branch with main#262

Merged
openshift-merge-bot[bot] merged 69 commits intoopenshift:release-4.21from
atiratree:sync-with-main
Feb 4, 2026
Merged

WRKLDS-1772: sync release-4.21 branch with main#262
openshift-merge-bot[bot] merged 69 commits intoopenshift:release-4.21from
atiratree:sync-with-main

Conversation

@atiratree
Copy link
Member

@atiratree atiratree commented Feb 4, 2026

We are doing a late branching of 4.21 since we plan to release a new version of the operator from this branch. Let's sync all the latest changes.

red-hat-konflux bot and others added 30 commits December 13, 2025 09:22
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
chore(deps): update konflux references main
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
chore(deps): update konflux references main
Image created from 'https://github.com/openshift/jobset-operator?rev=630601d3275a5ed74e96df9569b1f21b025e8cb4'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…ates/jobset-operator-bundle-main-component-update-jobset-operator-main

NO-JIRA: chore(deps): update jobset-operator-main to dcf372a
OCPBUGS-70198: Fix invalid JSON in CSV examples
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
chore(deps): update konflux references to 0b10508 main
Image created from 'https://github.com/openshift/jobset-operator?rev=839431f389b95f2c14a560e330bb877d9bda308e'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…t docker digest to 6fc28bc main

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…ates/jobset-operator-bundle-main-component-update-jobset-operator-main

NO-JIRA: chore(deps): update jobset-operator-main to 0cdf034
…n/registry.access.redhat.com-ubi9-ubi-minimal-latest

chore(deps): update registry.access.redhat.com/ubi9/ubi-minimal:latest docker digest to 6fc28bc main
chore(deps): update konflux references main
Image created from 'https://github.com/openshift/jobset-operator?rev=3dafa25bcc5bded7279430cba8d11f69178caa86'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…ates/jobset-operator-bundle-main-component-update-jobset-operator-main

NO-JIRA: chore(deps): update jobset-operator-main to 4d67afd
Image created from 'https://github.com/openshift/kubernetes-sigs-jobset?rev=183ef024ed7e4500e4b919af277f400e6e43c160'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…econcilliation

OCPBUGS-62997: Available condition should be always reconcilled and consider deployment health
Image created from 'https://github.com/openshift/jobset-operator?rev=6bc08faf478bda73cb50ea82c6da5f7ee592ceff'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
chore(deps): update konflux references main
…ates/jobset-operator-bundle-main-component-update-jobset-operand-main

"NO-JIRA: chore(deps): update jobset-operand-main to 2df3c4a"
…ates/jobset-operator-bundle-main-component-update-jobset-operator-main

"NO-JIRA: chore(deps): update jobset-operator-main to 405a6ab"
red-hat-konflux bot and others added 9 commits February 3, 2026 14:09
Image created from 'https://github.com/openshift/jobset-operator?rev=97591e13d73a2bb806495fc94c878f7519c6d9a7'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
update clusterPermissions, permissions and deployments
…ates/jobset-operator-bundle-main-component-update-jobset-operator-main

NO-JIRA: chore(deps): update jobset-operator-main to 4c7999f
…version

WRKLDS-1772: introduce update-cluster-service-version.sh script to automatically update clusterPermissions, permissions and deployments
Image created from 'https://github.com/openshift/jobset-operator?rev=96b79be0219e47f8d98507936014187c3fc6c2f4'

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…ates/jobset-operator-bundle-main-component-update-jobset-operator-main

NO-JIRA: chore(deps): update jobset-operator-main to dd4949b
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 4, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 4, 2026

@atiratree: This pull request references WRKLDS-1772 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 story to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.22" instead.

Details

In response to this:

We are doing a late branching to 4.21 since we plan to release a new version of the operator from this branch. Let's sync all the latest changes.

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 openshift-ci bot requested a review from ardaguclu February 4, 2026 13:25
@openshift-ci
Copy link

openshift-ci bot commented Feb 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atiratree

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

The pull request process is described 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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 4, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 4, 2026

@atiratree: This pull request references WRKLDS-1772 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 story to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.22" instead.

Details

In response to this:

We are doing a late branching of 4.21 since we plan to release a new version of the operator from this branch. Let's sync all the latest changes.

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.

Copy link
Member

@ardaguclu ardaguclu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just dropped a question. Other than that looks good to me.

module github.com/openshift/jobset-operator

go 1.24.0
go 1.25.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conceptually doesn't 4.21 refer to 1.24 and 1.34 go?. We are bumping to 1.35?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume that this is a requirement coming from new JobSet release?

Copy link
Member Author

@atiratree atiratree Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean technically we can keep the operator on go 1.24, but the operand has to run on 1.25 since yes it is coming with the new 0.11.0 release.

So I am not sure if it makes sense to have these on two different versions and might make sense to unify them.

@ardaguclu
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Feb 4, 2026
@ardaguclu
Copy link
Member

This PR looks good to me. Even if there is a missing piece, this can be handled in a followup PR
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 4, 2026
@atiratree
Copy link
Member Author

Thanks!

@atiratree
Copy link
Member Author

/test e2e-aws-operand

@atiratree
Copy link
Member Author

/retest

@openshift-ci
Copy link

openshift-ci bot commented Feb 4, 2026

@atiratree: 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.

@openshift-merge-bot openshift-merge-bot bot merged commit de61796 into openshift:release-4.21 Feb 4, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants