Revert "OCPBUGS-57049: certrotation: move test case name outside of AutoRegenerateAfterOfflineExpiry"

[neisw]

Reverts #1870

Investigating TRT-2269

Summary by CodeRabbit

• Chores
  • Standardized certificate rotation metadata annotations across multiple signers.
  • Removed obsolete test-name annotations from certificate metadata.
  • Consolidated offline-expiry regeneration notes with PR references into a single annotation value.
  • Cleaned up select description fields in metadata for consistency.
  • No changes to certificate rotation behavior or system functionality.

[openshift-ci-robot]

@neisw: This pull request references Jira Issue OCPBUGS-57049, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.0) matches configured target version for branch (4.20.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

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:

Reverts #1870

Investigating TRT-2269

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.

[coderabbitai]

Walkthrough

Static annotation metadata in cert rotation signers was updated in pkg/operator/certrotationcontroller/certrotationcontroller.go. TestName annotations were removed, and AutoRegenerateAfterOfflineExpiry values now include the PR URL plus an inline test-name string. No control flow, logic, or exported API changes.

Changes

Cohort / File(s)	Summary of Changes
Cert rotation annotations pkg/operator/certrotationcontroller/certrotationcontroller.go	Updated certrotation.AdditionalAnnotations across multiple signers: removed TestName entries; retained AutoRegenerateAfterOfflineExpiry but concatenated PR URL with inline test-name text; some Description fields dropped. No functional logic changes.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

• OCPBUGS-57049: certrotation: move test case name outside of AutoRegenerateAfterOfflineExpiry #1870 — Also modifies certrotation.AdditionalAnnotations usage in certrotationcontroller.go, adjusting how TestName and AutoRegenerateAfterOfflineExpiry are represented.

Suggested reviewers

• tkashem
• wangke19

Poem

A rabbit nibbles notes on leaves of certs,
Trims the TestName twigs, no logic hurts.
PR links entwine with whispers of expiry,
Signers all aligned, neat and wiry.
Thump-thump—metadata groomed just right,
Hops off, annotations light. 🐇✨

Tip

🔌 Remote MCP (Model Context Protocol) integration is now available!

Pro plan users can now connect to remote MCP servers from the Integrations page. Connect with popular remote MCPs such as Notion and Linear to add more context to your reviews and chats.

✨ Finishing Touches

• 📝 Generate Docstrings

🧪 Generate unit tests

• Create PR with unit tests
• Post copyable unit tests in a comment

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR/Issue comments)

Type @coderabbitai help to get the list of available commands.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Status, Documentation and Community

• Visit our Status Page to check the current availability of CodeRabbit.
• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[neisw]

/payload-aggregate periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upgrade-fips 10

[openshift-ci]

@neisw: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upgrade-fips

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/82125a00-82ce-11f0-9f78-fdab9c51a416-0

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (3)

pkg/operator/certrotationcontroller/certrotationcontroller.go (3)

272-279: LocalhostServing annotations restored; consider raw-string literal for readability.

The escaped quotes inside the test name are valid but noisy. Optional: switch to a raw string to avoid backslashes.

Example change for the first occurrence:

-                AutoRegenerateAfterOfflineExpiry: "https://github.com/openshift/cluster-kube-apiserver-operator/pull/1631,'[Conformance][sig-api-machinery][Feature:APIServer] local kubeconfig \"localhost.kubeconfig\" should be present on all masters and work [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel/minimal]'",
+                AutoRegenerateAfterOfflineExpiry: `https://github.com/openshift/cluster-kube-apiserver-operator/pull/1631,'[Conformance][sig-api-machinery][Feature:APIServer] local kubeconfig "localhost.kubeconfig" should be present on all masters and work [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel/minimal]'`,

Also applies to: 294-301, 309-314

---

531-538: LocalhostRecoveryServing annotations restored; optional raw-string for quoting.

Works as-is. If desired, use raw strings to drop the escaped quotes (same approach as suggested for LocalhostServing).

Also applies to: 553-560, 571-575

---

709-716: ControlPlaneNodeAdminClient: consider adding Description for consistency.

This block omits Description while most others include it. Not required, but helps readers scanning annotations.

Suggested addition:

         AdditionalAnnotations: certrotation.AdditionalAnnotations{
             JiraComponent:                    "kube-apiserver",
             AutoRegenerateAfterOfflineExpiry: "https://github.com/openshift/cluster-kube-apiserver-operator/pull/1631,'[Conformance][sig-api-machinery][Feature:APIServer] local kubeconfig \"control-plane-node.kubeconfig\" should be present in all kube-apiserver containers [Suite:openshift/conformance/parallel/minimal]'",
+            Description:                      "Client certificate used by the control-plane node admin (system:masters) for debugging and recovery flows.",
         },

Also applies to: 727-732, 742-746

📜 Review details

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 9649be0 and 65885d6.

📒 Files selected for processing (1)

• pkg/operator/certrotationcontroller/certrotationcontroller.go (36 hunks)

🔇 Additional comments (10)

pkg/operator/certrotationcontroller/certrotationcontroller.go (10)

158-162: Revert for aggregator client/CA/cert annotations looks correct.

Embedding the test name back into AutoRegenerateAfterOfflineExpiry matches the pre-#1870 format and keeps the link+test context together. No functional impact; structs remain valid and compile-safe.

Also applies to: 174-178, 188-192

---

214-219: KubeAPIServer→Kubelet signer/CA/cert: revert is consistent.

Values are correctly restored to the link+quoted test-name style. No issues spotted.

Also applies to: 232-236, 246-250

---

336-343: ServiceNetworkServing signer/CA/cert: revert is accurate.

Annotation format matches the intended link + test name pattern.

Also applies to: 358-365, 374-378

---

401-408: ExternalLoadBalancerServing annotations reverted cleanly.

Link and test name are properly inline; data is consistent across signer/CA/cert.

Also applies to: 423-430, 439-443

---

466-473: InternalLoadBalancerServing annotations reverted cleanly.

Mirrors the external LB block; no issues found.

Also applies to: 488-495, 504-508

---

597-604: KubeControllerManagerClient signer/CA/cert: annotation revert LGTM.

Uniform with other control-plane client certs; values consistent.

Also applies to: 615-620, 630-634

---

653-660: KubeSchedulerClient signer/CA/cert: annotation revert LGTM.

Consistent formatting and content; no further action needed.

Also applies to: 671-676, 686-690

---

764-771: CheckEndpointsClient annotations reverted correctly.

Inline test name and PR link format are consistent with the revert’s intent.

Also applies to: 782-787, 797-801

---

820-827: NodeSystemAdmin signer/CA/cert: revert LGTM.

Annotations are uniform across all three resources; no functional changes introduced.

Also applies to: 840-845, 855-859

---

153-171: Sanity check passed: no stray TestName fields and formatting consistent
All quick verification steps completed successfully:

• No remaining AdditionalAnnotations.TestName fields found.
• Every AutoRegenerateAfterOfflineExpiry entry in pkg/operator/certrotationcontroller/certrotationcontroller.go includes a PR URL, a comma, and a single-quoted test name as expected.

Ready to merge.

[dinhxuanvu]

@vrutkovs FYI

[vrutkovs]

Yeah, I don't mind - we can reapply this after #1901 lands

/approve
/lgtm
/label acknowledge-critical-fixes-only

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neisw, vrutkovs

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 [vrutkovs]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[vrutkovs]

/retest-required

[openshift-ci]

@neisw: 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-azure-ovn	65885d6	link	false	/test e2e-azure-ovn
ci/prow/e2e-gcp-operator-single-node	65885d6	link	false	/test e2e-gcp-operator-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-sigs/prow repository. I understand the commands that are listed here.

[openshift-ci-robot]

@neisw: Jira Issue OCPBUGS-57049: Some pull requests linked via external trackers have merged:

• openshift/origin#29327
• openshift/library-go#1971
• openshift/cluster-kube-apiserver-operator#1873
• openshift/library-go#1981

The following pull requests linked via external trackers have not merged:

• openshift/cluster-authentication-operator#776 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

In response to this:

Reverts #1870

Investigating TRT-2269

Summary by CodeRabbit

• Chores
• Standardized certificate rotation metadata annotations across multiple signers.
• Removed obsolete test-name annotations from certificate metadata.
• Consolidated offline-expiry regeneration notes with PR references into a single annotation value.
• Cleaned up select description fields in metadata for consistency.
• No changes to certificate rotation behavior or system functionality.

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.