[release-4.13] OCPBUGS-16023: Add the trusted CA bundle in UWM Prometheus pods

[openshift-cherrypick-robot]

This is an automated cherry-pick of #1970

/assign rexagod

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-11958 has been cloned as Jira Issue OCPBUGS-16023. Will retitle bug to link to clone.
/retitle [release-4.13] OCPBUGS-16023: Add the trusted CA bundle in UWM Prometheus pods

In response to this:

This is an automated cherry-pick of #1970

/assign rexagod

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.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-16023, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.13.z) matches configured target version for branch (4.13.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-11958 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
• dependent Jira Issue OCPBUGS-11958 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
• bug has dependents

Requesting review from QA contact:
/cc @juzhao

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #1970

/assign rexagod

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.

[rexagod]

/cherry-pick release-4.12

[openshift-cherrypick-robot]

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

In response to this:

/cherry-pick release-4.12

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.

[rexagod]

Cherry-picking over 4.12 since there seem to be conflicts.

EDIT: No conflicts, the bot picks multiple commits in no definite order, which ended up with conflicts (the original PR got merged before auto-squashing both fixup! commits). I've cherry-picked them in the correct order.

[juzhao]

/cc @Tai-RedHat please review and add qe-approved label if no issue.

[Tai-RedHat]

keep failing to build this pr with cluster bot, will test this after merged.
log,log2

[rexagod]

/test e2e-agnostic-operator

[openshift-ci]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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.

[raptorsun]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, raptorsun

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 [raptorsun]

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

[raptorsun]

/label backport-risk-assessed

[openshift-ci]

@raptorsun: Can not set label backport-risk-assessed: Must be member in one of these teams: [openshift-patch-managers]

In response to this:

/label backport-risk-assessed

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.

[jan--f]

/label backport-risk-assessed

[Tai-RedHat]

keep failing to build this pr with cluster bot, will test this after merged. log,log2

log3

/label cherry-pick-approved

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-16023: All pull requests linked via external trackers have merged:

• openshift/cluster-monitoring-operator#2041

Jira Issue OCPBUGS-16023 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #1970

/assign rexagod

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.

[openshift-cherrypick-robot]

@rexagod: #2041 failed to apply on top of branch "release-4.12":

Applying: Add the trusted CA bundle in UWM Prometheus pods
Using index info to reconstruct a base tree...
M	jsonnet/components/prometheus-user-workload.libsonnet
M	pkg/manifests/manifests.go
M	pkg/manifests/manifests_test.go
M	pkg/tasks/prometheus_user_workload.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/tasks/prometheus_user_workload.go
Auto-merging pkg/manifests/manifests_test.go
Auto-merging pkg/manifests/manifests.go
CONFLICT (content): Merge conflict in pkg/manifests/manifests.go
Auto-merging jsonnet/components/prometheus-user-workload.libsonnet
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add the trusted CA bundle in UWM Prometheus pods
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-4.12

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.

[rexagod]

^^JFYI The 4.12 back port was opened manually here.