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

Add mewzherder to Flux Community Maintainers #342

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

mewzherder
Copy link
Member

Membership from: #341

@kingdonb
Copy link
Member

There are some issues, I'm thinking somehow branches got mixed up - did you mean to make updates to SUPPORT.md in this PR? I can help resolve this, and it says I've got permission to edit the branch. Let's talk off thread and figure out out.

Will touch base at our next check-in to determine if there's meant to be a separate PR, or if these changes got included by mistake. We should only include the relevant changes in this PR – update to the MAINTAINERS file, and COMMUNITY.md - we should also be sure to remove your entry in the PROJECT-MEMBERS.md since otherwise you'll probably appear in both lists, and I don't think we want that.

🎉 welcome to the team (though it seems a bit strange to say this as if you haven't been notionally on this team even longer than myself!)

@kingdonb
Copy link
Member

It looks like that commit was from a stale branch that had already been merged.

It dropped out, so there's no DCO issue, so I can approve this and merge it now (except the discussion is in #341 and I think we are still waiting on a few maintainer approvals there)

It's an LGTM from me, as soon as the appropriate approvals are done in the discussion 👍

@mewzherder
Copy link
Member Author

@kingdonb thx! who / what steps are next to merge?

@kingdonb
Copy link
Member

kingdonb commented Jan 30, 2024

I reviewed PROCESS.md near this section:

Applying for Flux Maintainership
Process:

First it says we need all the active maintainers in the same repo (community) to vote, then a core maintainer (not me) must approve the PR - here is the relevant section: https://github.com/fluxcd/community/blob/main/PROCESS.md#applying-for-flux-maintainership

I will check if all maintainers have voted and ping whomever we are missing then we can move on to the next step.

Copy link
Member

@scottrigby scottrigby left a comment

Choose a reason for hiding this comment

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

100%. See #341 (comment)

COMMUNITY.md Outdated
| Tamao Nakahara | `@tamao` | `@mewzherder` | Weaveworks |
| Kingdon Barrett | `@KingdonB` | `@kingdonb` | Weaveworks |
| Tamao Nakahara | `@tamao` | `@mewzherder` | Independent |
| Kingdon Barrett | `@KingdonB` | `@kingdonb` | Independent |
Copy link
Member

Choose a reason for hiding this comment

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

@kingdonb this should go into a diffrent PR. Also the commits to this PR should be made Tamao and signed by her.

Copy link
Member

Choose a reason for hiding this comment

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

I think we tried using the GitHub UI and it went horribly wrong. I'll confer with Tamao and put the community affiliation changes in a separate PR 👍

Copy link
Member

Choose a reason for hiding this comment

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

GitHub UI works Ok, but first you need to delete the fork to start fresh, the UI also allows signoff.

Copy link
Member

Choose a reason for hiding this comment

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

I put the affiliation changes for COMMUNITY.md into #345 - they are separate now

We will still need to add @mewzherder sign-off and signature, (or is only sign-off enough?)

You should be able to add your sign-off with git commit --amend --sign-off so you get authorship on the commit, or you could close this PR and try a new one. I don't know if you want to try git pull --rebase -- it might just work?

Copy link
Member

Choose a reason for hiding this comment

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

I removed my sign-off so the DCO bot shows the check missing properly, so it's clearer what we are talking about.

I think it will be easier for Tamao to delete the fork and start over like you say 👍

Signed-off-by: Tamao Nakahara <tamaonakahara@gmail.com>
@kingdonb
Copy link
Member

I think we resolved all the issues in this PR, @stefanprodan can you confirm

Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

@stefanprodan stefanprodan merged commit 31180b0 into fluxcd:main Jan 31, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants