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

Syncing latest changes from main for kubernetes-csi-addons #85

Merged
merged 29 commits into from
Oct 12, 2023

Conversation

df-build-team
Copy link

PR containing the latest commits from main branch

nixpanic and others added 29 commits May 6, 2022 16:13
When kubernetes-csi-addons are included in the ODF product, we need to
document the review/backport guidelines and list the maintainers. This
repository is currently part of the responsibilities of the Ceph-CSI
team.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit 6b32ad6)
Dependabot does not need to report available updates for vendored
dependencies in the downstream repository. Updates to dependencies are
synced from the upstream repository when needed. There is also the
"Upstream First" requirement, which we follow closely.

See-also: https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates#open-pull-requests-limit
Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit 6e4f4ba)
As ODF-Operator is used for deploying the CSI-Addons components, the
CSI-Addons operator does not need to be visible in the OperatorHub.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2042997
Signed-off-by: Niels de Vos <ndevos@redhat.com>
(cherry picked from commit 15e9b1a)
There is no upstream icon for the CSI-Addons project yet. All operators
are required to have an icon before they can be published. Until there
is an icon in upstream, use the standard Red Hat icon for product
builds.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
Sync upstream main branch to downstream
This commits add instructions to resolve conflicts if they
arise while syncing upstream changes.

Signed-off-by: Rakshith R <rar@redhat.com>
[DOWNSTREAM-ONLY]: document process for resolving conflicts
Sync rhs:main with csi-addons:main NetworkFence: Explicitly mentioned Fenced and Unfenced state
sync the upstream main branch
Sync the upstream main branch
sync downstream with upstream
Yug left the company, so removing him from the team.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
[DOWNSTREAM-ONLY] remove Yug from OWNERS
Sync the upstream changes from `csi-addons/kubernetes-csi-addons:main` into the `main` branch
Sync upstream main branch
Depandabot automatic updating for GitHub Actions is not wanted. Changes
should flow in from the upstream repository instead.

See-also: 945da36
Signed-off-by: Niels de Vos <ndevos@redhat.com>
[DOWNSTREAM-ONLY] ci: disable Dependabot PR creation
sync downstream main with upstream main
sync downstream main with upstream main
sync downstream main with upstream main branch
sync downstream main with upstream main branch
sync downstream main with upstream main branch
sync downstream main with upstream main branch
Sync the upstream changes from `csi-addons/kubernetes-csi-addons:main` into the `main` branch
Sync the upstream changes from csi-addons/kubernetes-csi-addons:main into the main branch
sync downstream main with upstream main
Depandabot automatic updating for GitHub Actions is not wanted. Changes
should flow in from the upstream repository instead.

Closes: #82
See-also: 945da36
Signed-off-by: Niels de Vos <ndevos@redhat.com>
[DOWNSTREAM-ONLY] ci: disable Dependabot PR creation
@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the red-hat-storage org. You can then trigger verification by writing /verify-owners in a comment.

  • humblec
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

@Madhu-1
Copy link
Member

Madhu-1 commented Oct 12, 2023

@Nikhil-Ladha it looks like the owner files is not valid in this repo

@nixpanic
Copy link
Member

@Nikhil-Ladha it looks like the owner files is not valid in this repo

These are the downstream-only changes that are part of the main branch. It is good to have them in the release-4.15 branch as well.

/lgtm
/approve

## Backports

All changes in this repository are *backports* from the [upstream
project][https://github.com/ceph/ceph-csi]. There should be no functional
Copy link
Member

Choose a reason for hiding this comment

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

we should not have cephcsi link here

Copy link
Member

Choose a reason for hiding this comment

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

these things need to be corrected in the main branch.

Copy link
Member

@Nikhil-Ladha Nikhil-Ladha Oct 12, 2023

Choose a reason for hiding this comment

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

Well, there is no point in requesting changes here. These are just automated sync PRs that fetch commits and merge to release branch.
We can suggest and add commits to these or update the main branch and backport from there to avoid these type of issues.

Copy link
Member

Choose a reason for hiding this comment

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

🤦🏻

Copy link
Member

Choose a reason for hiding this comment

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

Addressed in #87

All changes in this repository are *backports* from the [upstream
project][https://github.com/ceph/ceph-csi]. There should be no functional
changes (only process/CI/building/..) in this repository compared to the
upstream project. Fixes for any of the release branches should first land in
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
upstream project. Fixes for any of the release branches should first land in
upstream project. Fixes for any of the release branches should first land in

Copy link
Member

Choose a reason for hiding this comment

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

🤦🏻

@Madhu-1
Copy link
Member

Madhu-1 commented Oct 12, 2023

/lgtm

@nixpanic
Copy link
Member

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the red-hat-storage org. You can then trigger verification by writing /verify-owners in a comment.

* humblec
  
  * User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.

Addressed with #86

@nixpanic
Copy link
Member

Codespell is expected to be addressed in upstream csi-addons#465 , needs backporting to the main branch in this repo.

@nixpanic
Copy link
Member

/approve
/override codespell

All required changes have been posted for the main branch and will be included in the next sync PR.

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

@nixpanic: Overrode contexts on behalf of nixpanic: codespell

In response to this:

/approve
/override codespell

All required changes have been posted for the main branch and will be included in the next sync PR.

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.

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: df-build-team, Madhu-1, nixpanic

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

@nixpanic
Copy link
Member

/override test-lint

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

@nixpanic: Overrode contexts on behalf of nixpanic: test-lint

In response to this:

/override test-lint

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.

@nixpanic nixpanic dismissed Madhu-1’s stale review October 12, 2023 08:26

Madhu added /lgtm already

@openshift-ci openshift-ci bot merged commit bfcb407 into release-4.15 Oct 12, 2023
17 of 19 checks passed
openshift-ci bot pushed a commit that referenced this pull request Oct 12, 2023
Reported-in: #85
Signed-off-by: Niels de Vos <ndevos@ibm.com>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/kubernetes-csi-addons that referenced this pull request Oct 12, 2023
Reported-in: red-hat-storage#85
Signed-off-by: Niels de Vos <ndevos@ibm.com>
df-build-team pushed a commit that referenced this pull request Oct 26, 2023
Reported-in: #85
Signed-off-by: Niels de Vos <ndevos@ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants