Skip to content
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

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

Merged
merged 3 commits into from Apr 16, 2024
Merged

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

merged 3 commits into from Apr 16, 2024

Conversation

marioferh
Copy link
Contributor

@marioferh marioferh commented Apr 10, 2024 •
edited

Add controller-id annotatoins to prometheus, alertmanager, thanos, and prometheus user workload, alertmanager user workload in order to implement prometheus-operator controller id feature prometheus-operator/prometheus-operator#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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 10, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 10, 2024 •
edited by openshift-ci bot

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

TODO

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 10, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 10, 2024
simonpasquier
simonpasquier reviewed Apr 10, 2024
View reviewed changes
Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need different ids for platform and user-workload operators. I suggest that we use <namespace>/<name> (e.g. openshift-monitoring/prometheus-operator and openshift-user-workload-monitoring/prometheus-operator).

jsonnet/components/thanos-ruler.libsonnet Outdated Show resolved Hide resolved
@marioferh marioferh force-pushed the controller_id_annotation branch 2 times, most recently from 0d647e0 to fddd1e4 Compare April 10, 2024 17:25
@simonpasquier
Copy link
Contributor

/retest

1 similar comment
@marioferh
Copy link
Contributor Author

/retest

@simonpasquier
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
@marioferh
Copy link
Contributor Author

/retest-required

@simonpasquier
Copy link
Contributor

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

@marioferh
Copy link
Contributor Author

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 openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
simonpasquier
simonpasquier reviewed Apr 11, 2024
View reviewed changes
Copy link
Contributor

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 11, 2024 •
edited by openshift-ci bot

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

Add controller-id annotatoins to prometheus, alertmanager, thanos, and prometheus user workload, alertmanager user workload in order to implement prometheus-operator controller id feature prometheus-operator/prometheus-operator#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. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 11, 2024 •
edited by openshift-ci bot

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

Add controller-id annotatoins to prometheus, alertmanager, thanos, and prometheus user workload, alertmanager user workload in order to implement prometheus-operator controller id feature prometheus-operator/prometheus-operator#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. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@marioferh marioferh changed the title WIP: MON-3783: add controller-id annotation to pods deployments and operator MON-3783: add controller-id annotation to pods deployments and operator Apr 11, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 11, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
@machine424
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 11, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7f498b4 and 2 for PR HEAD cd01b6a in total

@simonpasquier
Copy link
Contributor

/retest-required

@marioferh
Copy link
Contributor Author

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

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 39d33b2 and 1 for PR HEAD cd01b6a in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 3008a2b and 0 for PR HEAD cd01b6a in total

@openshift-ci-robot
Copy link
Contributor

/hold

Revision cd01b6a was retested 3 times: holding

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed lgtm Indicates that a PR is ready to be merged. labels Apr 13, 2024
@marioferh
add controller-id annotation to pods deployments and operator
4eca675 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@marioferh
add controller-id annotation to remote write prometheus client
45c97f1 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@marioferh
add controller-id annotation to thanos_ruler_test
bc91cca 
Signed-off-by: Mario Fernandez <mariofer@redhat.com>
@danielmellado
Copy link
Contributor

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 15, 2024
@danielmellado
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 15, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Apr 15, 2024

[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 [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
Copy link
Contributor

/skip

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 70dee51 and 2 for PR HEAD bc91cca in total

@danielmellado
Copy link
Contributor

/retest-required

@danielmellado
Copy link
Contributor

/skip

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Apr 16, 2024

@marioferh: 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.

@openshift-merge-bot openshift-merge-bot bot merged commit 6e85d9d into openshift:master Apr 16, 2024
17 checks passed
@Tai-RedHat
Copy link

PR tested with cluster-bot
/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Apr 16, 2024
@openshift-bot
Copy link
Contributor

[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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonpasquier simonpasquier simonpasquier left review comments

@machine424 machine424 machine424 left review comments

@rexagod rexagod Awaiting requested review from rexagod

Assignees

@danielmellado danielmellado

@simonpasquier simonpasquier

@machine424 machine424

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@marioferh @openshift-ci-robot @simonpasquier @machine424 @danielmellado @Tai-RedHat @openshift-bot