Skip to content

OCPBUGS-77248: Rebase to v1.34.2 for OCP 4.22#124

Merged
openshift-merge-bot[bot] merged 21 commits into
openshift:masterfrom
RomanBednar:rebase-v1.34.2
Mar 11, 2026
Merged

OCPBUGS-77248: Rebase to v1.34.2 for OCP 4.22#124
openshift-merge-bot[bot] merged 21 commits into
openshift:masterfrom
RomanBednar:rebase-v1.34.2

Conversation

@RomanBednar
Copy link
Copy Markdown

Upstream changelogs

Summary of changes

Carried commits

  • da3a402 UPSTREAM: : Add OpenShift files - cherry-pick (squashed with ART update 94cb5b0)
  • All other UPSTREAM: (number) commits - drop (already in v1.34.2)
  • All other UPSTREAM: commits - drop (already squashed into da3a402 or superseded)
  • 0a64968 UPSTREAM: : Update vendor - drop

Diff to upstream: kubernetes-sigs/azuredisk-csi-driver@v1.34.2...RomanBednar:azure-disk-csi-driver:rebase-v1.34.2

Previous rebase: #120

cc @openshift/storage


NOTE: This is a second rebase done in 4.22, but we need it to pull in this fix from latest upstream release:

dependabot Bot and others added 21 commits January 30, 2026 04:04
Bumps build-image/debian-base from bookworm-v1.0.6 to bookworm-v1.0.7.
…ot/cherry-pick-3489-to-release-1.34

[release-1.34] chore(deps): bump build-image/debian-base from bookworm-v1.0.6 to bookworm-v1.0.7 in /pkg/azurediskplugin
…ot/cherry-pick-3477-to-release-1.34

[release-1.34] fix: Correct CSI-Provisioner permissions for VAC
…ot/cherry-pick-3499-to-release-1.34

[release-1.34] fix: replace os.ReadDir with fs.ReadDir(1) to avoid extra memory usage
…ot/cherry-pick-3502-to-release-1.34

[release-1.34] test: fix trivy CVE-2025-68121 failure
…ot/cherry-pick-3506-to-release-1.34

[release-1.34] chore: refactor metrics pkg
…access-param

feat: add instantAccessDurationMinutes snapshot parameter for PremiumV2/UltraSSD disks
…3507-to-release-1.34

[release-1.34] feat: add instantAccessDurationMinutes snapshot parameter for PremiumV2/UltraSSD disks
…ot/cherry-pick-3513-to-release-1.34

[release-1.34] test: fix trivy CVE-2025-68121
…ar-images12-1.34

[release-1.34] chore: upgrade CSI sidecar image versions
Remove .github files, add .snyk file, update OWNERS, add Dockerfile.openshift.rhel7 and .ci-operator.yaml.

Additional changes: Update ose-azure-disk-csi-driver-container image to be consistent with ART for 4.22.
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 4, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@RomanBednar: This pull request references Jira Issue OCPBUGS-77492, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Upstream changelogs

Summary of changes

Carried commits

  • da3a402 UPSTREAM: : Add OpenShift files - cherry-pick (squashed with ART update 94cb5b0)
  • All other UPSTREAM: (number) commits - drop (already in v1.34.2)
  • All other UPSTREAM: commits - drop (already squashed into da3a402 or superseded)
  • 0a64968 UPSTREAM: : Update vendor - drop

Diff to upstream: kubernetes-sigs/azuredisk-csi-driver@v1.34.2...RomanBednar:azure-disk-csi-driver:rebase-v1.34.2

Previous rebase: #120

cc @openshift/storage


NOTE: This is a second rebase done in 4.22, but we need it to pull in this fix from latest upstream release:

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 review from jsafrane and tsmetana March 4, 2026 13:57
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: RomanBednar

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 Mar 4, 2026
@RomanBednar RomanBednar changed the title OCPBUGS-77492: Rebase to v1.34.2 for OCP 4.22 OCPBUGS-77248: Rebase to v1.34.2 for OCP 4.22 Mar 4, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. and removed jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. labels Mar 4, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@RomanBednar: This pull request references Jira Issue OCPBUGS-77248, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Upstream changelogs

Summary of changes

Carried commits

  • da3a402 UPSTREAM: : Add OpenShift files - cherry-pick (squashed with ART update 94cb5b0)
  • All other UPSTREAM: (number) commits - drop (already in v1.34.2)
  • All other UPSTREAM: commits - drop (already squashed into da3a402 or superseded)
  • 0a64968 UPSTREAM: : Update vendor - drop

Diff to upstream: kubernetes-sigs/azuredisk-csi-driver@v1.34.2...RomanBednar:azure-disk-csi-driver:rebase-v1.34.2

Previous rebase: #120

cc @openshift/storage


NOTE: This is a second rebase done in 4.22, but we need it to pull in this fix from latest upstream release:

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.

@RomanBednar
Copy link
Copy Markdown
Author

/retest-required

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 5, 2026

@RomanBednar: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azurestack-csi bdd4b4a link false /test e2e-azurestack-csi

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.

@RomanBednar
Copy link
Copy Markdown
Author

/jira refresh

@RomanBednar
Copy link
Copy Markdown
Author

/retest-required

@openshift-ci-robot
Copy link
Copy Markdown

@RomanBednar: This pull request references Jira Issue OCPBUGS-77248, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

@RomanBednar
Copy link
Copy Markdown
Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 9, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@RomanBednar: This pull request references Jira Issue OCPBUGS-77248, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (wduan@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

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.

@dobsonj
Copy link
Copy Markdown
Member

dobsonj commented Mar 10, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 10, 2026
@duanwei33
Copy link
Copy Markdown

CI looks good, and I have verified the "InstantAccessDurationMinutes" feature for OCPBUGS-77248.
/verified by @duanwei33

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 11, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@duanwei33: This PR has been marked as verified by @duanwei33.

Details

In response to this:

CI looks good, and I have verified the "InstantAccessDurationMinutes" feature for OCPBUGS-77248.
/verified by @duanwei33

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-merge-bot openshift-merge-bot Bot merged commit 950b162 into openshift:master Mar 11, 2026
11 of 12 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@RomanBednar: Jira Issue OCPBUGS-77248: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-77248 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

Upstream changelogs

Summary of changes

Carried commits

  • da3a402 UPSTREAM: : Add OpenShift files - cherry-pick (squashed with ART update 94cb5b0)
  • All other UPSTREAM: (number) commits - drop (already in v1.34.2)
  • All other UPSTREAM: commits - drop (already squashed into da3a402 or superseded)
  • 0a64968 UPSTREAM: : Update vendor - drop

Diff to upstream: kubernetes-sigs/azuredisk-csi-driver@v1.34.2...RomanBednar:azure-disk-csi-driver:rebase-v1.34.2

Previous rebase: #120

cc @openshift/storage


NOTE: This is a second rebase done in 4.22, but we need it to pull in this fix from latest upstream release:

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.

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/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.