search

openshift / cluster-monitoring-operator

Manage the OpenShift monitoring stack
Apache License 2.0
247 stars 363 forks source link

MON-3783: add controller-id annotation to pods deployments and operator #2309

Closed marioferh closed 6 months ago

marioferh commented 6 months ago

Add controller-id annotatoins to prometheus, alertmanager, thanos, and prometheus user workload, alertmanager user workload in order to implement prometheus-operator controller id feature https://github.com/prometheus-operator/prometheus-operator/pull/6319 to avoid issues when multiple operators are running.

E.g: 

annotations:
    operator.prometheus.io/controller-id: openshift-monitoring/prometheus-operator

Different id for user workload.

openshift-ci-robot commented 6 months ago

@marioferh: This pull request references MON-3783 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2309): >TODO Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
simonpasquier commented 6 months ago

/retest

marioferh commented 6 months ago

/retest

simonpasquier commented 6 months ago

/lgtm

marioferh commented 6 months ago

/retest-required

simonpasquier commented 6 months ago

the test failures seem to be legit as the prometheus & alertmanager pods don't show up.

marioferh commented 6 months ago

the test failures seem to be legit as the prometheus & alertmanager pods don't show up.

yep sorry I've thought that was related with ci issues.

openshift-ci-robot commented 6 months ago

@marioferh: This pull request references MON-3783 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2309): >Add controller-id annotatoins to prometheus, alertmanager, thanos, and prometheus user workload, alertmanager user workload in order to implement prometheus-operator controller id feature https://github.com/prometheus-operator/prometheus-operator/pull/6319 > >E.g: >``` >annotations: > operator.prometheus.io/controller-id: openshift-monitoring/prometheus-operator >``` > >Different id for user workload. > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 6 months ago

@marioferh: This pull request references MON-3783 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2309): >Add controller-id annotatoins to prometheus, alertmanager, thanos, and prometheus user workload, alertmanager user workload in order to implement prometheus-operator controller id feature https://github.com/prometheus-operator/prometheus-operator/pull/6319 to avoid issues when multiple operators are running. > >E.g: >``` >annotations: > operator.prometheus.io/controller-id: openshift-monitoring/prometheus-operator >``` > >Different id for user workload. > Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
machine424 commented 6 months ago

/lgtm

openshift-ci-robot commented 6 months ago

/retest-required

Remaining retests: 0 against base HEAD 7f498b49343756681f34d0d75013f193cfdc8a66 and 2 for PR HEAD cd01b6afc3b957d53119a6dd071bad8e6616d654 in total

simonpasquier commented 6 months ago

/retest-required

marioferh commented 6 months ago

ci/prow/e2e-agnostic-operator — Job failed is legit, investigating it.                    

openshift-ci-robot commented 6 months ago

/retest-required

Remaining retests: 0 against base HEAD 39d33b2f618cecd2ecb9bd7c80ca4422edc5f0d3 and 1 for PR HEAD cd01b6afc3b957d53119a6dd071bad8e6616d654 in total

openshift-ci-robot commented 6 months ago

/retest-required

Remaining retests: 0 against base HEAD 3008a2bb14c406a4c67ca1b2a7f48d55dcae4d25 and 0 for PR HEAD cd01b6afc3b957d53119a6dd071bad8e6616d654 in total

openshift-ci-robot commented 6 months ago

/hold

Revision cd01b6afc3b957d53119a6dd071bad8e6616d654 was retested 3 times: holding

danielmellado commented 6 months ago

/unhold

danielmellado commented 6 months ago

/lgtm

openshift-ci[bot] commented 6 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielmellado, machine424, marioferh, simonpasquier

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](https://github.com/openshift/cluster-monitoring-operator/blob/master/OWNERS)~~ [danielmellado,machine424,marioferh,simonpasquier] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
danielmellado commented 6 months ago

/skip

openshift-ci-robot commented 6 months ago

/retest-required

Remaining retests: 0 against base HEAD 70dee518689ea7041e9fcf6874f745baf24dc92c and 2 for PR HEAD bc91cca57c965faf88000d631ea683edec5f1730 in total

danielmellado commented 6 months ago

/retest-required

danielmellado commented 6 months ago

/skip

openshift-ci[bot] commented 6 months ago

@marioferh: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
Tai-RedHat commented 6 months ago

PR tested with cluster-bot /label qe-approved

openshift-bot commented 6 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202404160712.p0.g6e85d9d.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.