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

[release-next] Fast-forward master into release-next #1357

Merged
merged 394 commits into from
Dec 7, 2023
Merged

Conversation

maelvls
Copy link
Member

@maelvls maelvls commented Dec 7, 2023

Tanuj needs the release-next branch to be up to date so that he knows where to put the documentation about nameConstraints.

/hold

I want to hold Prow from auto-merging this PR we prefer not having needless merge commits when master can be fast-forwarded to release-next. Once this PR gets approved, I run the following commands:

git checkout release-next
git pull
git fetch origin master
git merge --ff-only origin/master

/override dco

I used the command /override dco is necessary because some the merge commits have been written by the bot and do not have a DCO signoff. The command /override dco needs to be re-issued every time a commit is merged to master.

jetstack-bot and others added 30 commits July 11, 2023 10:03
Fix docs broken link to Venafi OAuth config
Update sentence that was outdated.

Signed-off-by: Rafael Tanaka <[email protected]>
Update approver-policy README.md
Signed-off-by: Tim Ramlot <[email protected]>
Add release notes for 1.12.1, 1.12.2 and 1.12.3
Signed-off-by: cloudoutloud <[email protected]>
Add release notes for 1.11.2->1.11.4
…file

Annual review of the OWNERS file (2023): remove Joakim
Signed-off-by: John HU <[email protected]>
Signed-off-by: Ashley Davis <[email protected]>
Update supported releases about 1.13
Annual review of the OWNERS file (2023): Maartje moved to Emeritus Maintainer
Renaming all references to jetstack/testing
erikgb and others added 7 commits November 30, 2023 11:04
Co-authored-by: Ashley Davis <[email protected]>
Signed-off-by: Erik Godding Boye <[email protected]>
Add/update docs for new trust-manager features
Add a concrete example on how to restore a cert-manager installation
Add FAQ entry on keystore passwords
@jetstack-bot
Copy link
Contributor

@maelvls: Overrode contexts on behalf of maelvls: dco

In response to this:

/override dco

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.

@jetstack-bot jetstack-bot added dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 7, 2023
@maelvls
Copy link
Member Author

maelvls commented Dec 7, 2023

/override dco

@jetstack-bot
Copy link
Contributor

@maelvls: Overrode contexts on behalf of maelvls: dco

In response to this:

/override dco

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.

Copy link

netlify bot commented Dec 7, 2023

Deploy Preview for cert-manager-website ready!

Name Link
🔨 Latest commit 550f1f1
🔍 Latest deploy log https://app.netlify.com/sites/cert-manager-website/deploys/6571ad3a34ddd80008a63190
😎 Deploy Preview https://deploy-preview-1357--cert-manager-website.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@inteon
Copy link
Member

inteon commented Dec 7, 2023

/approve
/lgtm

@jetstack-bot
Copy link
Contributor

@inteon: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

/approve
/lgtm

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.

SgtCoDFish and others added 2 commits December 7, 2023 11:27
also adds a little more context

Signed-off-by: Ashley Davis <[email protected]>
Add permanent link to keystore passwords
@jetstack-bot
Copy link
Contributor

Thanks for your pull request. Before we can look at it, you'll need to add a 'DCO signoff' to your commits.

📝 Please follow instructions in the contributing guide to update your commits with the DCO

Full details of the Developer Certificate of Origin can be found at developercertificate.org.

The list of commits missing DCO signoff:

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.

@inteon
Copy link
Member

inteon commented Dec 7, 2023

@mael can you force push the master branch to release-next instead? That will prevent a merge commit from being created.

@maelvls
Copy link
Member Author

maelvls commented Dec 7, 2023

/override dco

@jetstack-bot
Copy link
Contributor

@maelvls: Overrode contexts on behalf of maelvls: dco

In response to this:

/override dco

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.

@maelvls
Copy link
Member Author

maelvls commented Dec 7, 2023

We decided to let the person click "Merge" in the UI instead of waiting for someone to approve to avoid having to ask another person to do this task. See decision in Slack.

To be added to the contributor documentation:

If you find that the release-next branch is missing some changes from master and are a GitHub admin of the website repository, you can click "Merge" in the UI instead of waiting for someone to approve to avoid having to ask another person to do this task.

/approve

Can someone LGTM? 😅

@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: inteon, maelvls

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

@jetstack-bot jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2023
@inteon
Copy link
Member

inteon commented Dec 7, 2023

/lgtm

@jetstack-bot
Copy link
Contributor

@inteon: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

/lgtm

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.

@maelvls
Copy link
Member Author

maelvls commented Dec 7, 2023

/hold

I want to hold Prow from auto-merging this PR we prefer not having needless merge commits when master can be fast-forwarded to release-next.

Richard agreed that we don't need another dev interaction for merging this kind of PR. I will click "Merge" manually.

@jetstack-bot jetstack-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2023
@maelvls maelvls changed the title [release-next] Merge master into release-next [release-next] Fast-forward master into release-next Dec 7, 2023
@maelvls maelvls merged commit 75ba347 into release-next Dec 7, 2023
8 of 9 checks passed
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. dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.