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.

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

MON-3900: Remove prometheus-adapter code #2409

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

slashpai
Copy link
Member

@slashpai slashpai commented Jul 9, 2024

pkg: remove prometheus-adapter code

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 9, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jul 9, 2024

@slashpai: This pull request references MON-3900 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 story to target the "4.17.0" version, but no target version was set.

In response to this:

pkg: remove prometheus-adapter code

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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 Jul 9, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2024
@slashpai slashpai force-pushed the remove-adapter branch 2 times, most recently from 08675a9 to 5bbe871 Compare July 9, 2024 06:49
@@ -104,7 +104,7 @@ type AlertmanagerMainConfig struct {
}

// The `K8sPrometheusAdapter` resource defines settings for the Prometheus Adapter component.
// This is deprecated and will be removed in a future version.
// This is deprecated config, setting this has no effect and will be removed in a future version.
Copy link
Member Author

Choose a reason for hiding this comment

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

Keeping this to check in 4.18 release if any user defined config exists in cmo's configmap and then block upgrades till removed

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a TODO comment? It doesn't have to be 4.18 "exactly" but setting a target is good.

@slashpai slashpai changed the title WIP: MON-3900: Remove prometheus-adapter code MON-3900: Remove prometheus-adapter code Jul 22, 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 Jul 22, 2024
@slashpai
Copy link
Member Author

/skip

@slashpai
Copy link
Member Author

@slashpai
Copy link
Member Author

/retest-required

@slashpai slashpai force-pushed the remove-adapter branch 2 times, most recently from 1c1afe0 to f43831b Compare July 24, 2024 07:12
@slashpai
Copy link
Member Author

@simonpasquier could you please review again?

@jan--f
Copy link
Contributor

jan--f commented Jul 24, 2024

Looks good! Happy to merge when CI and Simon are happy :)

@slashpai
Copy link
Member Author

I will rebase once #2414 is merged to fix generate issue

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 24, 2024
This change removes prometheus-adapter code from CMO

jsonnet: remove prometheus-adapter code

pkg: remove prometheus-adapter code

docs: remove prometheus-adapter refernces

Signed-off-by: Jayapriya Pai <janantha@redhat.comn>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2024
Copy link
Contributor

openshift-ci bot commented Jul 25, 2024

@slashpai: 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-sigs/prow repository. I understand the commands that are listed here.

@jan--f
Copy link
Contributor

jan--f commented Jul 29, 2024

/lgtm

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

openshift-ci bot commented Jul 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, slashpai

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

@openshift-merge-bot openshift-merge-bot bot merged commit f15addc into openshift:master Jul 29, 2024
18 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-monitoring-operator
This PR has been included in build cluster-monitoring-operator-container-v4.17.0-202407291514.p0.gf15addc.assembly.stream.el9.
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
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants