Skip to content

Clearify prometheus options and fix error in Helm chart #6694

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

Clearify prometheus options and fix error in Helm chart #6694

merged 1 commit into from
Feb 1, 2024

Conversation

inteon
Copy link
Member

@inteon inteon commented Feb 1, 2024

Clarifies the prometheus.enabled = true, prometheus.servicemonitor.enabled = false prometheus.podmonitor.enabled = false option using a comment.
Also makes the logic for adding the annotations aware of the podmonitor option (we missed this in #6459).

Kind

/kind bug

Release Note

NONE

@inteon
clearify prometheus options and fix error in Helm chart
cdba8a7 
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.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. 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
@ThatsMrTalbot
Copy link
Contributor

/lgtm

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

inteon commented Feb 1, 2024

/approve

@inteon
Copy link
Member Author

inteon commented Feb 1, 2024

/cherry-pick release-1.14

@jetstack-bot
Copy link
Contributor

@inteon: 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
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 8218f4d into cert-manager:master Feb 1, 2024
@jetstack-bot
Copy link
Contributor

@inteon: #6694 failed to apply on top of branch "release-1.14":

Applying: clearify prometheus options and fix error in Helm chart
Using index info to reconstruct a base tree...
M	deploy/charts/cert-manager/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/charts/cert-manager/values.yaml
CONFLICT (content): Merge conflict in deploy/charts/cert-manager/values.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 clearify prometheus options and fix error in Helm chart
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.

@wallrj wallrj mentioned this pull request Feb 1, 2024
Closed
73 tasks
@wallrj wallrj added this to the 1.14 milestone Feb 2, 2024
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
1.14
Development

Successfully merging this pull request may close these issues.
4 participants
@inteon @ThatsMrTalbot @jetstack-bot @wallrj