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.

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

STOR-1586: Rebase v1.29.3 #54

Merged
merged 41 commits into from Feb 7, 2024

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Jan 24, 2024

This PR uses git merge -s ours strategy for creating the rebase.

kubernetes-sigs/azurefile-csi-driver@v1.29.3...gnufied:azure-file-csi-driver:rebase-v1.29.3

umagnus and others added 30 commits November 24, 2023 07:11
[release-1.29] doc: add volume cloning doc
…ot/cherry-pick-1602-to-release-1.29

[release-1.29] doc: add noresvport, actimeo=30 mount option in static nfs pv
…ot/cherry-pick-1611-to-release-1.29

[release-1.29] chore: increase windows host deployment driver log level
…ot/cherry-pick-1613-to-release-1.29

[release-1.29] test: fix e2e test failure
…ot/cherry-pick-1616-to-release-1.29

[release-1.29] chore: reaplce NewSmbLink with os.Symlink call
…ot/cherry-pick-1639-to-release-1.29

[release-1.29] feat: upgrade azcopy to v10.22.1 for volume clone feature
…ot/cherry-pick-1642-to-release-1.29

[release-1.29] fix: reduce mount lock to avoid volumeID collision issue
commit 15c7f99
Merge: 8388a01 7fe3ebc
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 27 09:37:50 2023 +0000

    Merge branch 'master' of https://github.com/kubernetes-sigs/azurefile-csi-driver into workload-identity

commit 8388a01
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 27 09:33:51 2023 +0000

    fix

commit 44c4812
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 27 06:15:20 2023 +0000

    fix

commit 09e5b67
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 27 04:00:47 2023 +0000

    fix

commit 354f4d7
Author: weizhichen <weizhichen@microsoft.com>
Date:   Tue Dec 26 08:29:07 2023 +0000

    helm

commit 960912d
Merge: 0c58154 5dd86f5
Author: weizhichen <weizhichen@microsoft.com>
Date:   Tue Dec 26 08:00:51 2023 +0000

    Merge branch 'master' of https://github.com/kubernetes-sigs/azurefile-csi-driver into workload-identity

commit 0c58154
Merge: e3adfa4 d519073
Author: weizhichen <weizhichen@microsoft.com>
Date:   Mon Dec 18 02:18:53 2023 +0000

    Merge branch 'master' of https://github.com/kubernetes-sigs/azurefile-csi-driver into workload-identity

commit e3adfa4
Author: weizhichen <weizhichen@microsoft.com>
Date:   Thu Dec 14 03:17:25 2023 +0000

    spell

commit 78c82b5
Author: weizhichen <weizhichen@microsoft.com>
Date:   Thu Dec 14 03:09:16 2023 +0000

    doc

commit 7bb959f
Author: weizhichen <weizhichen@microsoft.com>
Date:   Thu Dec 14 03:05:08 2023 +0000

    doc

commit 2dde59d
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 13 14:45:37 2023 +0000

    doc

commit e774ff5
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 13 13:46:37 2023 +0000

    update go mod

commit 2e79ca3
Merge: 7846026 6cfe218
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 13 13:19:41 2023 +0000

    Merge branch 'master' of https://github.com/kubernetes-sigs/azurefile-csi-driver into workload-identity

commit 7846026
Author: weizhichen <weizhichen@microsoft.com>
Date:   Wed Dec 13 13:07:48 2023 +0000

    update go mod

commit 0446a46
Author: weizhichen <weizhichen@microsoft.com>
Date:   Fri Nov 24 08:52:03 2023 +0000

    update cloud-provider-azure

commit ff2aeb4
Author: weizhichen <weizhichen@microsoft.com>
Date:   Tue Nov 14 12:29:14 2023 +0000

    doc

commit 633641b
Author: weizhichen <weizhichen@microsoft.com>
Date:   Tue Nov 14 12:01:02 2023 +0000

    add docs

commit afcb818
Author: weizhichen <weizhichen@microsoft.com>
Date:   Tue Nov 14 11:20:40 2023 +0000

    feat: support workload identity setting in static PV mount on AKS
Signed-off-by: Fan Shang Xiang <fanshangxiang@gmail.com>
…t-permission-issue-1.29

[release-1.29] fix: mountPermission settting issue due to case insensitive parameter
[release-1.29] feat: support workload identity setting in static PV mount
…getClientID

[release-1.29] cleanup: remove getClientID func
…ot/cherry-pick-1645-to-release-1.29

[release-1.29] test: always use latest azcopy version in sanity test
…ttacher-1.29

[release-1.29] cleanup: remove csi-attacher config
@gnufied gnufied mentioned this pull request Jan 24, 2024
@gnufied
Copy link
Member Author

gnufied commented Jan 24, 2024

Failures in nfs-csi looks unrelated.

/retest

@duanwei33
Copy link

/test e2e-azure-file-nfs-csi
/test e2e-azure-file-csi-extended

@duanwei33
Copy link

/test e2e-azure-file-csi-extended

@duanwei33
Copy link

QE is working on pre-merge test.

@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?

@gnufied
Copy link
Member Author

gnufied commented Jan 30, 2024

@RomanBednar sure. I can do that.

@jsafrane
Copy link

/retest

@jsafrane
Copy link

jsafrane commented Feb 1, 2024

/retest-required

@duanwei33
Copy link

I hit the similar issue in pre-merge testing, the azure-file-csi-driver image build failed sometimes, and I got a successful job after several trying.

@jsafrane
Copy link

jsafrane commented Feb 1, 2024

/retest required

Copy link

openshift-ci bot commented Feb 1, 2024

@jsafrane: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test e2e-azure-file-csi
  • /test e2e-azure-file-nfs-csi
  • /test e2e-azure-ovn-upgrade
  • /test images
  • /test unit
  • /test verify-commits
  • /test verify-deps

The following commands are available to trigger optional jobs:

  • /test e2e-azure-file-csi-extended
  • /test e2e-azure-manual-oidc
  • /test security

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-azure-file-csi-driver-master-e2e-azure-file-csi
  • pull-ci-openshift-azure-file-csi-driver-master-e2e-azure-file-csi-extended
  • pull-ci-openshift-azure-file-csi-driver-master-e2e-azure-file-nfs-csi
  • pull-ci-openshift-azure-file-csi-driver-master-e2e-azure-ovn-upgrade
  • pull-ci-openshift-azure-file-csi-driver-master-images
  • pull-ci-openshift-azure-file-csi-driver-master-security
  • pull-ci-openshift-azure-file-csi-driver-master-unit
  • pull-ci-openshift-azure-file-csi-driver-master-verify-commits
  • pull-ci-openshift-azure-file-csi-driver-master-verify-deps

In response to this:

/retest required

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.

@duanwei33
Copy link

Manually tested the customer-facing feature looks good, and I launched e2e test manually, it got passed.
/label qe-approved

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

openshift-ci-robot commented Feb 2, 2024

@gnufied: This pull request references STOR-1586 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:

This PR uses git merge -s ours strategy for creating the rebase.

kubernetes-sigs/azurefile-csi-driver@v1.29.3...gnufied:azure-file-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.

@duanwei33
Copy link

/retest-required

1 similar comment
@jsafrane
Copy link

jsafrane commented Feb 2, 2024

/retest-required

@jsafrane
Copy link

jsafrane commented Feb 2, 2024

/retest
after openshift/release#48370

@jsafrane
Copy link

jsafrane commented Feb 2, 2024

/lgtm

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

openshift-ci bot commented Feb 2, 2024

@gnufied: all tests passed!

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.

@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 7de2bfa into openshift:master Feb 7, 2024
10 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-azure-file-csi-driver-container-v4.16.0-202402081110.p0.g7de2bfa.assembly.stream.el9 for distgit azure-file-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
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
Development

Successfully merging this pull request may close these issues.

None yet