Skip to content

Conversation

@stephenfin
Copy link
Contributor

Per $subject. This makes the clients in use a little more obvious (IMO).

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 28, 2025
@openshift-ci-robot
Copy link
Contributor

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

Details

In response to this:

Per $subject. This makes the clients in use a little more obvious (IMO).

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 review from dlom and suhanime May 28, 2025 15:01
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 28, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: stephenfin
Once this PR has been reviewed and has the lgtm label, please assign jstuever 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

@codecov
Copy link

codecov bot commented May 28, 2025

Codecov Report

❌ Patch coverage is 11.32075% with 47 lines in your changes missing coverage. Please review.
✅ Project coverage is 46.94%. Comparing base (92e68ab) to head (737fd18).
⚠️ Report is 61 commits behind head on master.

Files with missing lines Patch % Lines
pkg/cmd/operator/cmd.go 0.00% 20 Missing ⚠️
...ator/secretannotator/secretannotator_controller.go 0.00% 6 Missing ⚠️
pkg/operator/secretannotator/aws/reconciler.go 20.00% 4 Missing ⚠️
pkg/operator/secretannotator/azure/reconciler.go 0.00% 4 Missing ⚠️
pkg/operator/secretannotator/gcp/reconciler.go 0.00% 4 Missing ⚠️
...g/operator/secretannotator/openstack/reconciler.go 20.00% 4 Missing ⚠️
pkg/operator/secretannotator/vsphere/reconciler.go 0.00% 3 Missing ⚠️
pkg/aws/actuator/actuator.go 80.00% 1 Missing ⚠️
pkg/operator/controller.go 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #865      +/-   ##
==========================================
- Coverage   46.97%   46.94%   -0.04%     
==========================================
  Files          97       96       -1     
  Lines       11910    11919       +9     
==========================================
  Hits         5595     5595              
- Misses       5697     5706       +9     
  Partials      618      618              
Files with missing lines Coverage Δ
pkg/aws/actuator/actuator.go 65.52% <80.00%> (+0.07%) ⬆️
pkg/operator/controller.go 0.00% <0.00%> (ø)
pkg/operator/secretannotator/vsphere/reconciler.go 37.17% <0.00%> (ø)
pkg/operator/secretannotator/aws/reconciler.go 45.29% <20.00%> (+0.38%) ⬆️
pkg/operator/secretannotator/azure/reconciler.go 35.52% <0.00%> (ø)
pkg/operator/secretannotator/gcp/reconciler.go 45.28% <0.00%> (ø)
...g/operator/secretannotator/openstack/reconciler.go 54.01% <20.00%> (+0.39%) ⬆️
...ator/secretannotator/secretannotator_controller.go 0.00% <0.00%> (ø)
pkg/cmd/operator/cmd.go 0.00% <0.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 9, 2025
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
@stephenfin stephenfin force-pushed the simplify-secretannotator branch from c5f6a02 to 02ba77d Compare June 9, 2025 10:16
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 9, 2025
This will allow us to use this caching client shortly.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This was first introduced in commit 48d6ccc as a resolution to
OCPBUGS-16313 [1][2], which was itself introduced by the removal of
configmaps read access from the cluster role used by CCO. However,
non-caching clients are expensive and with the change introduced in the
previous commit, which restricted caching to specific config maps, plus
the existing role allowing access to these config maps, their use should
no longer be necessary.

[1] openshift#575
[2] https://issues.redhat.com/browse/OCPBUGS-16313

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This should have been cleaned up after debugging.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
@stephenfin stephenfin changed the title NO-JIRA: secretannotator: Only pass clients to Reconciler NO-JIRA: secretannotator: Only pass clients to Reconciler, remove use of non-caching client Jun 9, 2025
@stephenfin
Copy link
Contributor Author

/cc @jstuever

@openshift-ci openshift-ci bot requested a review from jstuever June 9, 2025 10:52
@stephenfin
Copy link
Contributor Author

/retest-required

@jstuever
Copy link
Contributor

jstuever commented Jun 30, 2025

@stephenfin I'm hesitant to merge this. While it may be beneficial to make the client use more clear, I don't see a functional reason to do so and am concerned that the change might have unintended consequences. I'm not sure it is worth the risk.

@jstuever
Copy link
Contributor

Disregard my last statement, I suddenly remember why we did this. Can you create and link a Jira bug for this?

@jstuever
Copy link
Contributor

jstuever commented Jul 2, 2025

/retest

@jstuever
Copy link
Contributor

jstuever commented Jul 2, 2025

It's going to take me a bit to review this one, there are a lot of moving parts here.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 2, 2025

@stephenfin: The following test 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/okd-scos-e2e-aws-ovn 737fd18 link false /test okd-scos-e2e-aws-ovn

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.

@stephenfin stephenfin changed the title NO-JIRA: secretannotator: Only pass clients to Reconciler, remove use of non-caching client CCO-691: secretannotator: Only pass clients to Reconciler, remove use of non-caching client Jul 14, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jul 14, 2025

@stephenfin: This pull request references CCO-691 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

Per $subject. This makes the clients in use a little more obvious (IMO).

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.

@stephenfin
Copy link
Contributor Author

stephenfin commented Jul 14, 2025

Disregard my last statement, I suddenly remember why we did this. Can you create and link a Jira bug for this?

Done.

It's going to take me a bit to review this one, there are a lot of moving parts here.

I'd encourage you to look at the individual commits. I have broken this down into a few smaller pieces that should hopefully be easier to review one by one.

Copy link
Contributor

@jstuever jstuever left a comment

Choose a reason for hiding this comment

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

I apologize for taking so long to review this one. I wanted to make sure I fully understood how the LiveClient was being used, specifically in the aws platform.

The AWS actuator(s) need the live client because the functions that they use to build the aws clients need to access the infrastructure resource in the cluster, which is not cached by the RootCredClient. This is acceptable because the live client is only called when the actuator is created within NewAWSActuator(). My recommendation is to revert all of the changes relevant to that.

In contrast, the OpenStack reconciler had started using the LiveClient within the reconcile() function. As a result, it was using a non-cached client on a regular basis. I would keep all of the changes that enable it to use the RootCredClient within the reconcile function (such as adding the resources to the filter).

@jstuever jstuever changed the title CCO-691: secretannotator: Only pass clients to Reconciler, remove use of non-caching client OCPBUGS-59937: secretannotator: Only pass clients to Reconciler, remove use of non-caching client Jul 29, 2025
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jul 29, 2025
@openshift-ci-robot
Copy link
Contributor

@stephenfin: This pull request references Jira Issue OCPBUGS-59937, which is invalid:

  • expected the bug to target the "4.20.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.

Details

In response to this:

Per $subject. This makes the clients in use a little more obvious (IMO).

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.

@jstuever
Copy link
Contributor

/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, 2025
@openshift-ci-robot
Copy link
Contributor

@jstuever: This pull request references Jira Issue OCPBUGS-59937, 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)
Details

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.

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.

4 participants