Fix backwards incompatible change: include a prometheus service by default

[inteon]

In #6459 the prometheus service was made conditional both on .Values.prometheus.enabled and .Values.prometheus.servicemonitor.enabled. This however conflicts with the original intentions of the author of this Service: #1942 (comment).
For that reason, we decided to still include the service when only .Values.prometheus.enabled is set.
We do however remove the service when .Values.prometheus.podmonitor.enabled is true and aim to add an extra option in the future to disable this service.

Kind

/kind bug

Release Note

Fix backwards incompatible removal of default prometheus Service resource.

[wallrj]

I would have preferred making the simplest possible change, and returning it to be exactly how it used to be.

$ git diff origin/release-1.13 origin/release-1.14 -- deploy/charts/cert-
manager/templates/service.yaml
diff --git a/deploy/charts/cert-manager/templates/service.yaml b/deploy/charts/cert-manager/templates/service.yaml
index ec34d5878..112a55228 100644
--- a/deploy/charts/cert-manager/templates/service.yaml
+++ b/deploy/charts/cert-manager/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.prometheus.enabled }}
+{{- if and .Values.prometheus.enabled .Values.prometheus.servicemonitor.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

What harm does the Service resource do if the user also enables PodMonitor?
What if a user wants the metrics Service for some other bespoke monitoring system and they want to use the PodMonitor?

I guess this can easily be changed again in a future release.

[inteon]

podmonitor was added in this release.
I think best thing to do right now is to keep the current behavior without extending the behavior to the new options that we added.

[wallrj]

Ok. Thanks.

/lgtm
/approve

[SgtCoDFish]

/lgtm
/approve

(Looks like the labels from the previous review weren't picked up. Adding my own review to poke prow)

[SgtCoDFish]

/cherry-pick release-1.14

[jetstack-bot]

@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]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SgtCoDFish, wallrj

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:

• OWNERS [SgtCoDFish,wallrj]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[jetstack-bot]

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

Applying: fix backwards incompatible change: include a prometheus service by default
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 fix backwards incompatible change: include a prometheus service by default
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]

I'll manually backport