Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

STOR-1579: Rebase v1.29.3 #75

Merged
merged 71 commits into from Feb 7, 2024
Merged

STOR-1579: Rebase v1.29.3 #75

merged 71 commits into from Feb 7, 2024

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Jan 23, 2024 •
edited

andyzhangx and others added 30 commits September 16, 2023 11:52
@andyzhangx
cleanup: refine Volume capabilities not supported error
d0eaa13
@k8s-ci-robot
Merge pull request kubernetes-sigs#1966 from k8s-infra-cherrypick-rob…
143756c 
…ot/cherry-pick-1965-to-release-1.29

[release-1.29] cleanup: refine Volume capabilities not supported error
@andyzhangx
chore: refine create-volume metrics
400c980
@andyzhangx
fix: Ultra and PremiumV2 disk snapshot delay issue
e235d22
@andyzhangx
feat: add wait-for-snapshot-ready flag
f7f50c8
@k8s-ci-robot
Merge pull request kubernetes-sigs#1980 from k8s-infra-cherrypick-rob…
781ebc6 
…ot/cherry-pick-1953-to-release-1.29

[release-1.29] fix: Ultra and PremiumV2 disk snapshot delay issue
@andyzhangx
Merge pull request kubernetes-sigs#1974 from k8s-infra-cherrypick-rob…
1ee9e9d 
…ot/cherry-pick-1973-to-release-1.29

[release-1.29] chore: refine create-volume metrics
@andyzhangx
fix: increase snapshot timeout to 20min
154159c
@andyzhangx
Merge pull request kubernetes-sigs#1982 from andyzhangx/snapshot-time…
b7fc927 
…out-increase-1.29

[release-1.29] fix: increase snapshot timeout to 20min
@RomanBednar
allow resizing to min required size for performance plus disks
9f77016
@andyzhangx
Merge pull request kubernetes-sigs#1986 from k8s-infra-cherrypick-rob…
8fb2b5a 
…ot/cherry-pick-1950-to-release-1.29

[release-1.29] fix: allow resizing to min required size for performance plus disks
@daniel-weisse
fix: ensure Kubernets conformant format for location
9bf18ef 
Signed-off-by: Daniel Weiße <dw@edgeless.systems>
@k8s-ci-robot
Merge pull request kubernetes-sigs#1988 from k8s-infra-cherrypick-rob…
4f261ae 
…ot/cherry-pick-1981-to-release-1.29

[release-1.29] fix: ensure Kubernets conformant format for location
@andyzhangx
doc: fix code spelling errors
c81c8a4
@andyzhangx
Merge pull request kubernetes-sigs#1996 from andyzhangx/fix-code-spel…
14a5718 
…l-1.29

[release-1.29] doc: fix code spelling errors
@andyzhangx
test: fix verify-helm-chart failure
a982416
@andyzhangx
Merge pull request kubernetes-sigs#2002 from k8s-infra-cherrypick-rob…
06a80ed 
…ot/cherry-pick-2001-to-release-1.29

[release-1.29] test: fix verify-helm-chart failure
@andyzhangx
fix: CVE-2023-39325
3e23084
@andyzhangx
Merge pull request kubernetes-sigs#2010 from andyzhangx/CVE-2023-39325-…
9d9cba3 
…1.29

[release-1.29] fix: CVE-2023-39325
@andyzhangx
doc: cut v1.29.1 release
247dcf0
@andyzhangx
Merge pull request kubernetes-sigs#2019 from andyzhangx/cut-v1.29.1
0df3b6b 
doc: cut v1.29.1 release
@cvvz
[release-1.29]chore: fix google.golang.org/grpc GHSA-m425-mq94-257g
0364f1f
@k8s-ci-robot
Merge pull request kubernetes-sigs#2029 from cvvz/release-1.29
fe44ccc 
[release-1.29]chore: fix google.golang.org/grpc GHSA-m425-mq94-257g
@andyzhangx
chore: update max data disk table
099b7f5
@andyzhangx
Merge pull request kubernetes-sigs#2039 from k8s-infra-cherrypick-rob…
10f309c 
…ot/cherry-pick-2038-to-release-1.29

[release-1.29] chore: update max data disk table
@andyzhangx
feat: upgrade snapshot version to v6.3.1
6e22768 
fix
@andyzhangx
Merge pull request kubernetes-sigs#2051 from andyzhangx/upgrade-snaps…
c44937b 
…hot-6.3.1-1.29

[release-1.29] feat: upgrade snapshot version to v6.3.1
@andyzhangx
fix: v1.29.1.1-windows-hp image
3ec3bab
@andyzhangx
Merge pull request kubernetes-sigs#2061 from andyzhangx/v1.29.1.1-fix…
97684da 
…-1.29

[release-1.29] fix: v1.29.1.1-windows-hp image
@andyzhangx
fix: CVE-2023-5528
1f72f9f
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gnufied

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:

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 Jan 23, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 23, 2024 •
edited by openshift-ci bot

@gnufied: This pull request references STOR-1579 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 the "4.16.0" version, but no target version was set.

In response to this:

Fixes https://issues.redhat.com/browse/STOR-1579

kubernetes-sigs/azuredisk-csi-driver@v1.29.3...gnufied:azure-disk-csi-driver:rebase-v1.29.3

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.

jsafrane
jsafrane reviewed Jan 24, 2024
View reviewed changes
.github/workflows/codespell.yml Outdated
@@ -0,0 +1,16 @@
# GitHub Action to automate the identification of common misspellings in text files.
Copy link

Choose a reason for hiding this comment

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

please remove .github directory, we don't want upstream automated workflows.

Copy link
Member Author

Choose a reason for hiding this comment

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

I was trying to see, how did this came back when I clearly picked a063e77 commit. But then I think, this directory came back because two more files were added in upstream, which our downstream PR didn't remove. I will make a new commit for it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@duanwei33
Copy link

QE is working on pre-merge test.

@duanwei33
Copy link

One case failed in e2e-azure-csi-extended because the message changes, will fix it as soon as the PR gets merged.

@RomanBednar
Copy link

@gnufied For other rebases I amended the .snyk file to a single commit - the one that adds openshift files: UPSTREAM: <carry>: Add OpenShift files

Wouldn't it be better to do it here too and reduce the amount of carries?

@jsafrane
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 30, 2024 •
edited

@gnufied: 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-azure-csi-extended a63fa78 link false /test e2e-azure-csi-extended

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.

@dobsonj dobsonj mentioned this pull request Jan 30, 2024
Closed
@duanwei33
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Feb 1, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 1, 2024 •
edited by openshift-ci bot

@gnufied: This pull request references STOR-1579 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 the "4.16.0" version, but no target version was set.

In response to this:

Fixes https://issues.redhat.com/browse/STOR-1579

kubernetes-sigs/azuredisk-csi-driver@v1.29.3...gnufied:azure-disk-csi-driver:rebase-v1.29.3

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.

@jsafrane
Copy link

jsafrane commented Feb 1, 2024

/lgtm
/retest-required

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

gnufied commented Feb 7, 2024

/label docs-approved
/label px-approved

@openshift-ci openshift-ci bot added docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Feb 7, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 0b2b8d6 into openshift:master Feb 7, 2024
9 of 10 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-azure-disk-csi-driver-container-v4.16.0-202402072112.p0.g0b2b8d6.assembly.stream.el9 for distgit ose-azure-disk-csi-driver.
All builds following this will include this PR.

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

@jsafrane jsafrane jsafrane left review comments

@bertinatto bertinatto Awaiting requested review from bertinatto

@tsmetana tsmetana Awaiting requested review from tsmetana

Assignees

@jsafrane jsafrane

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. docs-approved Signifies that Docs has signed off on this PR 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. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet