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

Upstream merge #210

Closed
wants to merge 28 commits into from
Closed

Conversation

mdbooth
Copy link
Contributor

@mdbooth mdbooth commented Jun 17, 2021

This merges upstream master into downstream master. We also disable unit tests which are not relevant due to a downstream carry patch.

Fedosin and others added 28 commits March 2, 2020 12:34
Add Dockerfiles for openshift ci
Add Bugzilla component information
Bug 1837421: Fetch latest upstream patches
In 4.5, NFS driver pod used 'clientaddr=<pod ip>' as a mount option.
When such pod restarts, it gets a different IP address and volumes mounted
by the old pod are basically broken - all operations (stat, umount) will
just hang forever.

Therefore:

1. Do not use IsLikelyNotMountPoint - it runs stat() on the volume, which
could hang forever. Read /etc/mounts instead.

2. Use "umount -f" to forcefully remove NFS mount.

Carry at least for whole OCP 4.6, where we need to support move from 4.5.
This PR is autogenerated by the [ocp-build-data-enforcer][1].
It updates the baseimages in the Dockerfile used for promotion in order to ensure it
matches the configuration in the [ocp-build-data repository][2] used
for producing release artifacts.

If you believe the content of this PR is incorrect, please contact the dptp team in
#forum-testplatform.

[1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer
[2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6-rhel-8/images
…baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating images/Dockerfile baseimages to mach ocp-build-data config
Bug 1867152: <carry>: Umount volumes with force
This PR is autogenerated by the [ocp-build-data-enforcer][1].
It updates the base images in the Dockerfile used for promotion in order to ensure it
matches the configuration in the [ocp-build-data repository][2] used
for producing release artifacts.

Instead of merging this PR you can also create an alternate PR that includes the changes found here.

If you believe the content of this PR is incorrect, please contact the dptp team in
#aos-art.

[1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer
[2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6/images
tomassedovic out, adduarte in
…baseimages-to-mach-ocp-build-data-config

Bug 1878163: Updating images/Dockerfile baseimages to mach ocp-build-data config
Update shiftstack-team membership
….7-csi-driver-nfs

Updating csi-driver-nfs builder & base images to be consistent with ART
….7-csi-driver-nfs

Bug 1916164: Updating csi-driver-nfs builder & base images to be consistent with ART
* pkg/nfs/nodeserver.go
    Significant manual merging due to conflicts with downstream
    commit 59fe400: #31
This is an autogenerated PR that updates the `.ci-operator.yaml`
to reference the `build_root_image` found in the [ci-operator-config](https://github.com/openshift/release/tree/master/ci-operator/config)
in the [openshift/release](https://github.com/openshift/release) repository.

This is done in preparation for enabling reading the `build_root` from
your repository rather than the central config in [openshift/release](https://github.com/openshift/release).
This allows to update the `build_root` in lockstep with code changes. For details, please
refer to the [docs](https://docs.ci.openshift.org/docs/architecture/ci-operator/#build-root-image).

Note that enabling this feature is mandatory for all OCP components that have an ART build config.

A second autogenerated PR to the [openshift/release repository](https://github.com/openshift/release)
will enable reading the `build_root` from your repository once this PR was merged.

If you have any questions, please feel free to reach out in the #forum-testplatform
channel in the CoreOS Slack.
…yaml-`build_root_image`-from-openshift/release

Updating .ci-operator.yaml `build_root_image` from openshift/release
Conflicts:
  pkg/nfs/nodeserver.go

kubernetes-csi#201 removed locks
in NodePublishVolume and NodeUnpublishVolume which conflicted with a
downstream-only patch.
Disable unit tests which fail and have no direct replacement due to
carry patch 59fe400.
@k8s-ci-robot
Copy link
Contributor

@mdbooth: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jun 17, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mdbooth
To complete the pull request process, please assign xing-yang after the PR has been reviewed.
You can assign the PR to them by writing /assign @xing-yang in a comment when ready.

The full list of commands accepted by this bot can be found 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

@k8s-ci-robot k8s-ci-robot requested review from j-griffith and pohly June 17, 2021 16:48
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 17, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @mdbooth. Thanks for your PR.

I'm waiting for a kubernetes-csi member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 17, 2021
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Jun 17, 2021
@mdbooth mdbooth closed this Jun 17, 2021
andyzhangx added a commit to andyzhangx/csi-driver-nfs that referenced this pull request Dec 16, 2023
b54c1ba Merge pull request kubernetes-csi#246 from xing-yang/go_1.21
5436c81 Change go version to 1.21.5
267b40e Merge pull request kubernetes-csi#244 from carlory/sig-storage
b42e5a2 nominate self (carlory) as kubernetes-csi reviewer
a17f536 Merge pull request kubernetes-csi#210 from sunnylovestiramisu/sidecar
011033d Use set -x instead of die
5deaf66 Add wrapper script for sidecar release

git-subtree-dir: release-tools
git-subtree-split: b54c1ba
TerryHowe pushed a commit to TerryHowe/csi-driver-nfs that referenced this pull request Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants