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

[release-4.14] OCPBUGS-22718: manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver: Rename to kube-apiserver-performance-recording-rules #1572

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #1566

/assign sdodson

…: 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-robot
Copy link

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-20331 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.14] OCPBUGS-22718: manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver: Rename to kube-apiserver-performance-recording-rules

In response to this:

This is an automated cherry-pick of #1566

/assign sdodson

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 openshift-ci bot changed the title [release-4.14] OCPBUGS-20331: manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver: Rename to kube-apiserver-performance-recording-rules [release-4.14] OCPBUGS-22718: manifests/0000_90_kube-apiserver-operator_04_servicemonitor-apiserver: Rename to kube-apiserver-performance-recording-rules Oct 31, 2023
@sdodson
Copy link
Member

sdodson commented Oct 31, 2023

/close
No need for backport per upstream PR

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

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

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-22718, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-20331 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-20331 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @wangke19

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

In response to this:

This is an automated cherry-pick of #1566

/assign sdodson

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

openshift-ci bot commented Oct 31, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign soltysh for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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
Copy link
Contributor

openshift-ci bot commented Oct 31, 2023

@sdodson: Closed this PR.

In response to this:

/close
No need for backport per upstream PR

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

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

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

In response to this:

This is an automated cherry-pick of #1566

/assign sdodson

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

None yet

4 participants