Skip to content

operator,storage-operator: bump operator-sdk to v1.42.2#5000

Merged
bert-e merged 3 commits into
development/134.0from
improvement/bump-operator-sdk-1.42.2
Jun 29, 2026
Merged

operator,storage-operator: bump operator-sdk to v1.42.2#5000
bert-e merged 3 commits into
development/134.0from
improvement/bump-operator-sdk-1.42.2

Conversation

@eg-ayoub

@eg-ayoub eg-ayoub commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

Component: operator, storage-operator

Context:
Tracks MK8S-237 (operator-sdk + Go bump) and MK8S-224 (k8s.io libraries bump).

Summary:
Realign both operator and storage-operator scaffolds with operator-sdk v1.42.2 using the upgrade-operator-sdk tool, in two separate commits (one per operator).

field before after
operator_sdk_version v1.42.1 v1.42.2
k8s_libs v0.33.10 v0.33.13
go_toolchain go1.24.13 go1.24.13
controller-runtime v0.21.0 v0.21.0

Go toolchain and controller-runtime are intentionally not bumped: operator-sdk v1.42.2 still bundles kubebuilder/v4 v4.6.0, which scaffolds go 1.24.0 and controller-runtime v0.21.0. We follow the operator-sdk's scaffold to avoid drift.

For the same reason, only the k8s.io/{api,apimachinery,client-go} patch (v0.33.10 → v0.33.13) is taken in scope of MK8S-224 here. The full move to k8s.io v0.34.x will be done in a follow-up once operator-sdk picks up a newer kubebuilder (currently v0.21.0 controller-runtime is not compatible with k8s.io v0.34.x).

Acceptance criteria:

  • make test passes for both operators (verified locally).
  • make metalk8s regenerates manifests without diff churn (verified).

@eg-ayoub eg-ayoub requested a review from a team as a code owner June 22, 2026 15:21
@claude

claude Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

1 similar comment
@claude

claude Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

@eg-ayoub eg-ayoub force-pushed the improvement/bump-rockylinux-9.8 branch from 7d5327b to 0b83b2d Compare June 23, 2026 09:59
@eg-ayoub eg-ayoub force-pushed the improvement/bump-operator-sdk-1.42.2 branch from c77fbb3 to 1dfc298 Compare June 23, 2026 09:59
@claude

claude Bot commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

g-carre
g-carre previously approved these changes Jun 25, 2026
@eg-ayoub eg-ayoub force-pushed the improvement/bump-rockylinux-9.8 branch from 0b83b2d to e815165 Compare June 26, 2026 09:09
@eg-ayoub eg-ayoub force-pushed the improvement/bump-operator-sdk-1.42.2 branch from 1dfc298 to e329892 Compare June 26, 2026 09:09
@claude

claude Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

1 similar comment
@claude

claude Bot commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

eg-ayoub and others added 3 commits June 29, 2026 10:17
python3 tools/upgrade-operator-sdk/upgrade.py --operator-dir operator --config-dir tools/upgrade-operator-sdk/operator

Scaffold realigned with operator-sdk v1.42.2 and k8s.io dependencies
pinned to v0.33.13. Go toolchain stays at 1.24.13 and
controller-runtime at v0.21.0, matching what kubebuilder v4.6.0
(bundled with operator-sdk v1.42.2) scaffolds.

Refs: MK8S-237, MK8S-224

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
python3 tools/upgrade-operator-sdk/upgrade.py --operator-dir storage-operator --config-dir tools/upgrade-operator-sdk/storage-operator

Scaffold realigned with operator-sdk v1.42.2 and k8s.io dependencies
pinned to v0.33.13. Go toolchain stays at 1.24.13 and
controller-runtime at v0.21.0, matching what kubebuilder v4.6.0
(bundled with operator-sdk v1.42.2) scaffolds.

Refs: MK8S-237, MK8S-224

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@eg-ayoub eg-ayoub force-pushed the improvement/bump-rockylinux-9.8 branch from e815165 to 9832496 Compare June 29, 2026 08:28
@eg-ayoub eg-ayoub force-pushed the improvement/bump-operator-sdk-1.42.2 branch from e329892 to 59f94f5 Compare June 29, 2026 08:28
@claude

claude Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

1 similar comment
@claude

claude Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

LGTM

Review by Claude Code

Base automatically changed from improvement/bump-rockylinux-9.8 to development/134.0 June 29, 2026 13:19
@bert-e bert-e dismissed stale reviews from g-carre and anthony-treuillier-scality June 29, 2026 13:19

The base branch was changed.

@bert-e

bert-e commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Hello eg-ayoub,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e

bert-e commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

@eg-ayoub

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e

bert-e commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/134.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/127.0
  • development/128.0
  • development/129.0
  • development/130.0
  • development/131.0
  • development/132.0
  • development/133.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye eg-ayoub.

The following options are set: approve

@bert-e bert-e merged commit 59f94f5 into development/134.0 Jun 29, 2026
29 checks passed
@bert-e bert-e deleted the improvement/bump-operator-sdk-1.42.2 branch June 29, 2026 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants