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

OCPBUGS-20331: manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver: Rename to kube-apiserver-performance-recording-rules #1566

Merged
merged 1 commit into from Oct 31, 2023

Conversation

wking
Copy link
Member

@wking wking commented Oct 10, 2023

Exactly like 7457da4 (#1565), this pivot:

  • Turns the original (group, namepspace, name) into a delete manifest, with no capability annotation (all clusters should delete this resource).
  • Creates a (group, namespace, newName) manifest with the original spec content and capability annotation (only clusters with the cap enabled should have this resource).

which allows updates like:

  1. Old release with the old (kind, group, namepspace, name) not annotated for a capability.
  2. Request update to new release.
  3. Outgoing cluster-version operator compares the outgoing manifests with the incoming manifests to decide if any capabilities need to be implicitly enabled:
    1. It sees that the old (kind, group, namepspace, name) isn't labeled with any capabilities, so no need to implicitly enable anything there.
    2. It sees that the new (kind, group, namespace, newName) is annotated for the capability, but it doesn't see anything with that k,g,n,n getting reconciled in the outgoing manifest set, so it thinks "just some new manifest for a capability I do not care about", and does not enable the annotated capability.

In a separate pull request than 7457da4, because this one doesn't need to go back to 4.14. The RecordingRule is from 04f36e7 (#1521), which landed in 4.14, so 4.13 clusters do not have a matching (kind, group, namespace, name) manifest to worry about matching.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 10, 2023
@openshift-ci-robot
Copy link

@wking: This pull request references Jira Issue OCPBUGS-20331, which is valid.

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

Requesting review from QA contact:
/cc @evakhoni

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

In response to this:

Carrying #1565 with a fixup profile annotation.

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.

@vrutkovs
Copy link
Member

/close

Updated original PR, as it has better description. In case I'm unavailable feel free to reopen and add fixes

@openshift-ci openshift-ci bot closed this Oct 10, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 10, 2023

@vrutkovs: Closed this PR.

In response to this:

/close

Updated original PR, as it has better description. In case I'm unavailable feel free to reopen and add fixes

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

@wking: This pull request references Jira Issue OCPBUGS-20331. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

Carrying #1565 with a fixup profile annotation.

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.

@wking
Copy link
Member Author

wking commented Oct 12, 2023

I'd like to rebase and add the same kind of pivot to #1551's kube-apiserver-recording-rules PrometheusRule.

/reopen

@openshift-ci openshift-ci bot reopened this Oct 12, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 12, 2023

@wking: Reopened this PR.

In response to this:

I'd like to rebase and add the same kind of pivot to #1551's kube-apiserver-recording-rules PrometheusRule.

/reopen

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

@wking: This pull request references Jira Issue OCPBUGS-20331, which is valid.

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

Requesting review from QA contact:
/cc @evakhoni

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

In response to this:

Carrying #1565 with a fixup profile annotation.

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.

@wking
Copy link
Member Author

wking commented Oct 12, 2023

openshift-cloud-credential-operator TargetDown seems orthogonal:

/retest

@wking wking changed the title OCPBUGS-20331: manifests: rename API performance dashboard OCPBUGS-20331: manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver: Rename to kube-apiserver-performance-recording-rules Oct 12, 2023
@wking
Copy link
Member Author

wking commented Oct 12, 2023

@vrutkovs pointed out that this PrometheusRule was new in 4.14, so we won't need to backport this change to 4.14. I've rerolled with 0b6040b -> 0412fb3 to sit in parallel with #1565 instead of on top of it.

…: Rename to kube-apiserver-performance-recording-rules

Exactly like 7457da4 (manifests: rename API performance dashboard,
2023-10-10, openshift#1565), this pivot:

* Turns the original (group, namepspace, name) into a delete manifest,
  with no capability annotation (all clusters should delete this
  resource).
* Creates a (group, namespace, newName) manifest with the original spec
  content and capability annotation (only clusters with the cap
  enabled should have this resource).

which allows updates like:

1. Old release with the old (group, namepspace, name) not annotated for a capability.
2. Request update to new release.
3. Outgoing cluster-version operator compares the outgoing manifests
   with the incoming manifests to decide if any capabilities need to be
   implicitly enabled:
   a. It sees that the old (group, namepspace, name) isn't labeled
      with any capabilities, so no need to implicitly enable anything
      there.
   b. It sees that the new (group, namespace, newName) is annotated
      for the capability, but it doesn't see anything with that g,n,n
      getting reconciled in the outgoing manifest set, so it thinks
      "just some new manifest for a capability I do not care about",
      and does not enable the annotated capability.

In a separate pull request than 7457da4, because this one doesn't
need to go back to 4.14.  The RecordingRule is from 04f36e7
(manifests: add new PrometheusRule for recording rules, 2023-06-28, openshift#1521),
which landed in 4.14, so 4.13 clusters do not have a matching (group,
namespace, name) manifest to worry about matching.
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 12, 2023

@wking: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-operator-disruptive-single-node acd4178 link false /test e2e-aws-operator-disruptive-single-node
ci/prow/e2e-metal-single-node-live-iso acd4178 link false /test e2e-metal-single-node-live-iso
ci/prow/e2e-gcp-operator-single-node acd4178 link false /test e2e-gcp-operator-single-node
ci/prow/e2e-aws-ovn-single-node acd4178 link false /test e2e-aws-ovn-single-node

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.

Copy link
Member

@dgrisonnet dgrisonnet left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, wking

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 Oct 30, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d01fc2a and 2 for PR HEAD acd4178 in total

@openshift-ci openshift-ci bot merged commit 5ac4554 into openshift:master Oct 31, 2023
11 of 15 checks passed
@openshift-ci-robot
Copy link

@wking: Jira Issue OCPBUGS-20331: All pull requests linked via external trackers have merged:

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

In response to this:

Exactly like 7457da4 (#1565), this pivot:

  • Turns the original (group, namepspace, name) into a delete manifest, with no capability annotation (all clusters should delete this resource).
  • Creates a (group, namespace, newName) manifest with the original spec content and capability annotation (only clusters with the cap enabled should have this resource).

which allows updates like:

  1. Old release with the old (kind, group, namepspace, name) not annotated for a capability.
  2. Request update to new release.
  3. Outgoing cluster-version operator compares the outgoing manifests with the incoming manifests to decide if any capabilities need to be implicitly enabled:
    1. It sees that the old (kind, group, namepspace, name) isn't labeled with any capabilities, so no need to implicitly enable anything there.
    2. It sees that the new (kind, group, namespace, newName) is annotated for the capability, but it doesn't see anything with that k,g,n,n getting reconciled in the outgoing manifest set, so it thinks "just some new manifest for a capability I do not care about", and does not enable the annotated capability.

In a separate pull request than 7457da4, because this one doesn't need to go back to 4.14. The RecordingRule is from 04f36e7 (#1521), which landed in 4.14, so 4.13 clusters do not have a matching (kind, group, namespace, name) manifest to worry about matching.

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.

@wking wking deleted the rename-api-dashboard branch October 31, 2023 04:29
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2023-10-31-054858

@sdodson
Copy link
Member

sdodson commented Oct 31, 2023

/cherry-pick release-4.14

@openshift-cherrypick-robot

@sdodson: new pull request created: #1572

In response to this:

/cherry-pick release-4.14

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.

@sdodson
Copy link
Member

sdodson commented Oct 31, 2023

Nevermind. No need for 4.14 backport per

@vrutkovs pointed out that this PrometheusRule was new in 4.14, so we won't need to backport this change to 4.14. I've rerolled with 0b6040b -> 0412fb3 to sit in parallel with #1565 instead of on top of it.

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

7 participants