Skip to content

NO-JIRA: Move AdditionalAnnotations to pkg/operator/tlsartifact#2146

Open
sanchezl wants to merge 2 commits intoopenshift:masterfrom
sanchezl:tlsartifact-refactor
Open

NO-JIRA: Move AdditionalAnnotations to pkg/operator/tlsartifact#2146
sanchezl wants to merge 2 commits intoopenshift:masterfrom
sanchezl:tlsartifact-refactor

Conversation

@sanchezl
Copy link
Copy Markdown
Contributor

@sanchezl sanchezl commented Mar 20, 2026

Overview

Moves the AdditionalAnnotations type, Certificate* annotation constants, and NewTLSArtifactObjectMeta helper from pkg/operator/certrotation to pkg/operator/tlsartifact, and removes the backward-compatible aliases that were left behind in pkg/operator/certrotation/annotations.go.

This avoids circular dependencies — these types are used by packages that have no relation to cert rotation and should not need to import it:

  • pkg/operator/resourcesynccontroller — CA bundle ConfigMap management
  • pkg/operator/csr — CSR-based certificate management
  • pkg/certs/cert-inspection — TLS registry analysis

All consumers now import tlsartifact directly.

@openshift-ci-robot
Copy link
Copy Markdown

@sanchezl: This pull request explicitly references no jira issue.

Details

In response to this:

Overview

Moves the AdditionalAnnotations type, Certificate* annotation constants, and NewTLSArtifactObjectMeta helper from pkg/operator/certrotation to a new pkg/operator/tlsartifact package.

These are part of the TLS Artifacts Registry enhancement and are used by packages that have no relation to cert rotation:

  • pkg/operator/resourcesynccontroller — CA bundle ConfigMap management
  • pkg/operator/csr — CSR-based certificate management
  • pkg/certs/cert-inspection — TLS registry analysis

Moving them removes unnecessary cross-package dependencies on certrotation.

Backward-compatible type aliases and re-exported constants remain in pkg/operator/certrotation/annotations.go so existing consumers are unaffected.

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 20, 2026
@openshift-ci openshift-ci bot requested review from jsafrane and p0lyn0mial March 20, 2026 02:26
@sanchezl sanchezl force-pushed the tlsartifact-refactor branch from 7bdfde1 to de54bbd Compare March 20, 2026 15:34
@sanchezl sanchezl force-pushed the tlsartifact-refactor branch from de54bbd to 8cc05c8 Compare March 20, 2026 15:56
@sanchezl
Copy link
Copy Markdown
Contributor Author

sanchezl commented Mar 20, 2026

Repos requiring certrotation.*tlsartifact.* import update

  • oc
  • cluster-kube-apiserver-operator
  • cluster-kube-controller-manager-operator
  • cluster-kube-scheduler-operator
  • cluster-etcd-operator
  • cluster-monitoring-operator
  • cluster-authentication-operator
  • cluster-network-operator
  • machine-config-operator
  • hypershift

@sanchezl
Copy link
Copy Markdown
Contributor Author

/test unit

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 20, 2026

@sanchezl: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@hasbro17
Copy link
Copy Markdown

/lgtm

Thanks for calling out the consumer repos that need the import update.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 25, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hasbro17, sanchezl
Once this PR has been reviewed and has the lgtm label, please assign p0lyn0mial for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

3 participants