Skip to content

Merge master into release-next#1393

Merged
jetstack-bot merged 249 commits intocert-manager:release-nextfrom
SgtCoDFish:release-next-merge
Jan 18, 2024
Merged

Merge master into release-next#1393
jetstack-bot merged 249 commits intocert-manager:release-nextfrom
SgtCoDFish:release-next-merge

Conversation

@SgtCoDFish
Copy link
Copy Markdown
Member

@SgtCoDFish SgtCoDFish commented Jan 18, 2024

This fixes several merge conflicts as master and release-next have diverged.

maelvls and others added 30 commits March 22, 2023 12:08
Signed-off-by: Maël Valais <mael@vls.dev>
Signed-off-by: Krzysztof Pudłowski <djkormo@gmail.com>
Signed-off-by: Krzysztof Pudłowski <djkormo@gmail.com>
adding new version of adcs-issuer
Signed-off-by: Maël Valais <mael@vls.dev>
…-not-recommended

Venafi Issuer: Explain why "Do not select 'refresh token enabled'"
changing release site for adcs-issuer

Signed-off-by: Krzysztof Pudłowski <djkormo@gmail.com>
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
Signed-off-by: Adam Talbot <adam.talbot@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Prashant Antil <Prashant.Antil@GlobalSign.com>
Fix error in request-certificate diagram
Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
Tested with:
* cert-manager: v1.13.3
* AKS Kubernetes: 1.27.7
* az: 2.56.0

Signed-off-by: Richard Wall <richard.wall@venafi.com>
Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
…-update

Improve + fix signature verification examples
Signed-off-by: Richard Wall <wallrj@users.noreply.github.com>
Signed-off-by: Richard Wall <wallrj@users.noreply.github.com>
…bleshooting

Webhook troubleshooting: advise people to set `timeoutSeconds` to 30 seconds
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
hawksight and others added 3 commits January 18, 2024 11:10
Signed-off-by: Peter Fiddes <peter.fiddes@gmail.com>
Signed-off-by: Richard Wall <richard.wall@venafi.com>
This includes manual fixes for several merge conflicts
@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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 18, 2024
@netlify
Copy link
Copy Markdown

netlify bot commented Jan 18, 2024

Deploy Preview for cert-manager-website ready!

Name Link
🔨 Latest commit 2029924
🔍 Latest deploy log https://app.netlify.com/sites/cert-manager-website/deploys/65a920903018f20008e711f6
😎 Deploy Preview https://deploy-preview-1393--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.

@jetstack-bot
Copy link
Copy Markdown
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:

Details

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.

@jetstack-bot jetstack-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 18, 2024
@SgtCoDFish
Copy link
Copy Markdown
Member Author

/override dco

@jetstack-bot
Copy link
Copy Markdown
Contributor

@SgtCoDFish: Overrode contexts on behalf of SgtCoDFish: dco

Details

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.

@SgtCoDFish SgtCoDFish changed the title Release next merge Merge master into release-next Jan 18, 2024
@wallrj
Copy link
Copy Markdown
Member

wallrj commented Jan 18, 2024

/lgtm

Thanks!

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2024
@SgtCoDFish
Copy link
Copy Markdown
Member Author

/override dco

@jetstack-bot
Copy link
Copy Markdown
Contributor

@SgtCoDFish: Overrode contexts on behalf of SgtCoDFish: dco

Details

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.

@SgtCoDFish SgtCoDFish added approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. and removed dco-signoff: no Indicates that at least one commit in this pull request is missing the DCO sign-off message. labels Jan 18, 2024
@jetstack-bot jetstack-bot merged commit dd0d409 into cert-manager:release-next Jan 18, 2024
@jetstack-bot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

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: yes Indicates that all commits in the pull request have the valid DCO sign-off message. lgtm Indicates that a PR is ready to be merged. 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.