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: Merge v1.29.3 #53

Closed
wants to merge 35 commits into from
Closed

Conversation

gnufied
Copy link
Member

@gnufied gnufied commented Jan 23, 2024

This PR was created using git merge v1.29.3 , since @RomanBednar previously rebased against v1.29.2. I still ran in a one line conflict in go.mod file, but that was it.

Alternative is to to use git merge -s ours and while cherry-picking certain commits, I am not sure I was getting some unexpected conflicts.

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

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
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 23, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 23, 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 was created using git merge v1.29.3 , since @RomanBednar previously rebased against v1.29.2. I still ran in a one line conflict in go.mod file, but that was it.

Alternative is to to use git merge -s ours and while cherry-picking certain commits, I am not sure I was getting some unexpected conflicts.

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

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

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
@gnufied
Copy link
Member Author

gnufied commented Jan 23, 2024

/retest

Copy link

openshift-ci bot commented Jan 23, 2024

@gnufied: The following tests 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-file-nfs-csi d5f5c77 link true /test e2e-azure-file-nfs-csi
ci/prow/e2e-azure-file-csi d5f5c77 link true /test e2e-azure-file-csi
ci/prow/images d5f5c77 link true /test images
ci/prow/e2e-azure-file-csi-extended d5f5c77 link false /test e2e-azure-file-csi-extended
ci/prow/e2e-azure-ovn-upgrade d5f5c77 link true /test e2e-azure-ovn-upgrade

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 Jan 23, 2024

Hmm, the build is getting killed:


[1/2] STEP 5/5: RUN make azurefile ARCH=$(go env GOARCH) && cp _output/$(go env GOARCH)/azurefileplugin .
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags "-X sigs.k8s.io/azurefile-csi-driver/pkg/azurefile.driverVersion=v1.29.3 -X sigs.k8s.io/azurefile-csi-driver/pkg/azurefile.gitCommit=8703cfa272b38a318040659654dab4a928e4f72c -X sigs.k8s.io/azurefile-csi-driver/pkg/azurefile.buildDate=2024-01-23T21:33:50Z -s -w -extldflags '-static'" -mod vendor -o _output/amd64/azurefileplugin ./pkg/azurefileplugin
github.com/Azure/azure-sdk-for-go/services/network/mgmt/2022-07-01/network: /usr/lib/golang/pkg/tool/linux_amd64/compile: signal: killed
make: *** [Makefile:131: azurefile] Error 1
error: build error: building at STEP "RUN make azurefile ARCH=$(go env GOARCH) && cp _output/$(go env GOARCH)/azurefileplugin .": while running runtime: exit status 2
�[36mINFO�[0m[2024-01-23T21:35:14Z] Ran for 5m25s                                
�[31mERRO�[0m[2024-01-23T21:35:14Z] Some steps failed:      

afaict, it is not failing as such. Just getting killed. Investigating more.

@gnufied
Copy link
Member Author

gnufied commented Jan 24, 2024

Closing in favour of #54

/close

@openshift-ci openshift-ci bot closed this Jan 24, 2024
Copy link

openshift-ci bot commented Jan 24, 2024

@gnufied: Closed this PR.

In response to this:

Closing in favour of #54

/close

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.

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants