Skip to content

Run update-helm-docs to fix Helm README #6695

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Feb 1, 2024
Merged

Run update-helm-docs to fix Helm README #6695

merged 1 commit into from
Feb 1, 2024

Conversation

SgtCoDFish
Copy link
Member

Pull Request Motivation

⚠️ There doesn't appear to be any working CI for this generated file, so it's not currently tested that this is correct.

Kind

/kind bug

NONE

@SgtCoDFish
run update-helm-docs to fix Helm README
86b1282 
Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
@jetstack-bot jetstack-bot added kind/bug Categorizes issue or PR as related to a bug. release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. labels Feb 1, 2024
@SgtCoDFish
Copy link
Member Author

/cherry-pick release-1.14

@jetstack-bot
Copy link
Contributor

@SgtCoDFish: once the present PR merges, I will cherry-pick it on top of release-1.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.14

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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. area/deploy Indicates a PR modifies deployment configuration labels Feb 1, 2024
@SgtCoDFish SgtCoDFish mentioned this pull request Feb 1, 2024
Merged
@inteon
Copy link
Member

inteon commented Feb 1, 2024

/approve
/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2024
@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: inteon

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 Feb 1, 2024
@jetstack-bot jetstack-bot merged commit 3cdd44b into cert-manager:master Feb 1, 2024
@jetstack-bot
Copy link
Contributor

@SgtCoDFish: #6695 failed to apply on top of branch "release-1.14":

Applying: run update-helm-docs to fix Helm README
.git/rebase-apply/patch:16: trailing whitespace.
Enable Prometheus monitoring for the cert-manager controller to use with the. Prometheus Operator. If this option is enabled without enabling `prometheus.servicemonitor.enabled` or  
.git/rebase-apply/patch:17: trailing whitespace.
`prometheus.podmonitor.enabled`, 'prometheus.io' annotations are added to the cert-manager Deployment resources.  
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	deploy/charts/cert-manager/README.template.md
Falling back to patching base and 3-way merge...
Auto-merging deploy/charts/cert-manager/README.template.md
CONFLICT (content): Merge conflict in deploy/charts/cert-manager/README.template.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 run update-helm-docs to fix Helm README
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.14

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 deleted the fixreadme branch February 1, 2024 10:45
SgtCoDFish added a commit to SgtCoDFish/cert-manager that referenced this pull request Feb 1, 2024
@SgtCoDFish
[release-1.14] fix helm readme
e7f4a2d 
manual backport of cert-manager#6695

Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
@SgtCoDFish SgtCoDFish mentioned this pull request Feb 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/deploy Indicates a PR modifies deployment configuration dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SgtCoDFish @jetstack-bot @inteon