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

OCPBUGS-35095: drop redundant KSM selector from KubeCPUOvercommit #2422

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-35095: drop redundant KSM selector from KubeCPUOvercommit #2422

wants to merge 1 commit into from

Conversation

rexagod
Copy link
Member

@rexagod rexagod commented Jul 29, 2024

Sync changes with upstream.

  • 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 jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 29, 2024
@openshift-ci-robot
Copy link
Contributor

@rexagod: This pull request references Jira Issue OCPBUGS-35095, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Sync changes with upstream.

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

openshift-ci bot commented Jul 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rexagod

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2024
@rexagod
Copy link
Member Author

rexagod commented Jul 29, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 29, 2024
@openshift-ci-robot
Copy link
Contributor

@rexagod: This pull request references Jira Issue OCPBUGS-35095, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

/jira refresh

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 requested a review from juzhao July 29, 2024 19:54
@juzhao
Copy link
Contributor

juzhao commented Jul 30, 2024

/retest

@simonpasquier
Copy link
Contributor

@rexagod need to run "make generate"?

@simonpasquier
Copy link
Contributor

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 30, 2024
@rexagod
Copy link
Member Author

rexagod commented Jul 31, 2024 •
edited
Loading

IIUC It seems updating k-mixin dependency to the corresponding upstream commit breaks the dashboards. Earlier I used to jb update <dependency>@<commit> and generate the manifests (so as to not update all the deps, including the breaking dashboard updates), but I was afraid that we'll hit a point where it won't be possible anymore due to the recent refactor upstream.

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-monitoring-operator/2422/pull-ci-openshift-cluster-monitoring-operator-master-generate/1818209242499256320#1:build-log.txt%3A275

@rexagod
Copy link
Member Author

rexagod commented Jul 31, 2024 •
edited
Loading

I can push for a branch upstream that ports post-refactor commits while making use of the earlier Grafana v11 dashboards. Or we might want to refactor our jsonnets internally (better IMO).

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 3, 2024
@rexagod rexagod mentioned this pull request Sep 23, 2024
Merged
2 tasks
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 7, 2024
rexagod
rexagod commented Oct 7, 2024
View reviewed changes
jsonnet/jsonnetfile.json
@@ -58,14 +58,13 @@
"version": "main"
},
{
"name": "kubernetes-mixin is pinned because newer versions are breaking MON-3837",
Copy link
Member Author

Choose a reason for hiding this comment

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

cc @simonpasquier @machine424

Since #2482 removed CMO's dependency on k/k-mixin for dashboards, I believe we can unpin and sync with upstream to update the recording rules that depend on the same.

Copy link
Member Author

@rexagod rexagod Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

A follow-up PR will unpin the kubernetes-monitoring/kubernetes-mixin version.

Ah, never mind, I just noticed Simon's comment there.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think that we can remove the whole entry for kubernetes-monitoring/kubernetes-mixin and just depend on the version pulled by kube-prometheus.

@rexagod
Copy link
Member Author

rexagod commented Oct 16, 2024

/test e2e-aws-ovn-single-node

@rexagod
Copy link
Member Author

rexagod commented Oct 20, 2024

Good for reviews now. 🙂

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 4, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 4, 2024
@rexagod
Copy link
Member Author

rexagod commented Nov 4, 2024

/test e2e-agnostic-operator

1 similar comment
@rexagod
Copy link
Member Author

rexagod commented Nov 5, 2024

/test e2e-agnostic-operator

@rexagod
OCPBUGS-35095: sync k-mixin with upstream
9f13c4e 
Also drop redundant KSM selector from KubeCPUOvercommit.

Signed-off-by: Pranshu Srivastava <[email protected]>
@rexagod
Copy link
Member Author

rexagod commented Nov 10, 2024

/test e2e-agnostic-operator

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 11, 2024

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

simonpasquier
simonpasquier reviewed Nov 19, 2024
View reviewed changes
jsonnet/jsonnetfile.json
@@ -58,14 +58,13 @@
"version": "main"
},
{
"name": "kubernetes-mixin is pinned because newer versions are breaking MON-3837",
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that we can remove the whole entry for kubernetes-monitoring/kubernetes-mixin and just depend on the version pulled by kube-prometheus.

assets/control-plane/prometheus-rule.yaml
@@ -336,7 +336,7 @@ spec:
description: The kubernetes apiserver has terminated {{ $value | humanizePercentage }} of its incoming requests.
summary: The kubernetes apiserver has terminated {{ $value | humanizePercentage }} of its incoming requests.
expr: |
sum(rate(apiserver_request_terminations_total{job="apiserver"}[10m])) / ( sum(rate(apiserver_request_total{job="apiserver"}[10m])) + sum(rate(apiserver_request_terminations_total{job="apiserver"}[10m])) ) > 0.20
sum by(cluster) (rate(apiserver_request_terminations_total{job="apiserver"}[10m])) / ( sum by(cluster) (rate(apiserver_request_total{job="apiserver"}[10m])) + sum by(cluster) (rate(apiserver_request_terminations_total{job="apiserver"}[10m])) ) > 0.20
Copy link
Contributor

Choose a reason for hiding this comment

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

unrelated to this PR but I'd recommend to remove the KubeAPITerminatedRequests alerting rule since we're not owners for the API server. And same goes with KubeAPIDown.

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

@danielmellado danielmellado Awaiting requested review from danielmellado

@marioferh marioferh Awaiting requested review from marioferh

@juzhao juzhao Awaiting requested review from juzhao

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rexagod @openshift-ci-robot @juzhao @simonpasquier @openshift-merge-robot