Fix: Add a check for tektonconfig status by hasanawad94 · Pull Request #256 · shipwright-io/operator

hasanawad94 · 2025-05-11T13:11:09Z

Changes

Added a check for tektonconfig before progressing in the reconciliation process.

Fixes #167

Submitter Checklist

[ x ] Includes tests if functionality changed/was added
Includes docs if changes are user-facing
Set a kind label on this PR
[ x ] Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

Fix: build status reports ready early when tektonconfig is at Error/not available state

hasanawad94 · 2025-05-11T13:19:53Z

Test still needs fixing

adambkaplan

/approve

Code changes generally look good. Asking for a few changes before we call this good to merge:

Add the check for not found errors
Update the commit message so it is more complete. Tekton has an excellent guide on writing good commit messages.

controllers/shipwrightbuild_controller.go

controllers/shipwrightbuild_controller_test.go

hasanawad94 · 2025-05-14T13:16:46Z

Thanks for the review @adambkaplan . Did the changes.

hasanawad94 · 2025-05-22T15:43:49Z

Cleaning up tests

hasanawad94 · 2025-05-23T12:12:27Z

I have updated some tests to create the tektonconfig since its status being ready is now required after the fix

adambkaplan

/approve

Marking this as a fix worth adding.

/hold

There is a bit of risk with this change, I'd rather not merge it as we are getting ready for the v0.16.0 release. After we release v0.16.0 I think it's fine to merge.

controllers/shipwrightbuild_controller.go

openshift-ci · 2025-06-03T18:39:55Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [adambkaplan]

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

hasanawad94 · 2025-06-10T11:40:14Z

Thanks for the points @adambkaplan !
I have refactored the logic to improve its clarity and error handling.

adambkaplan · 2025-06-10T20:15:30Z

The e2e appeared to have flaked - timed out waiting for the operator pod to become ready. We may consider increasing the timeout from 5m to 10 or 15 minutes (in a separate pull request).

adambkaplan

Code wise this looks good. However, I do ask that you fix the typos and formatting of the commit message. These serve as excellent reference for future maintainers (maybe even your future self!).

Tekton has excellent guidelines on how to write a well formed commit message.

Add a TektonConfig readiness check to the ShipwrightBuild reconcile loop to ensure that the operator proceeds only when the TektonConfig is available and ready. This prevents reconciliation of the Build resource which depends on Tekton components. The new function `fetchAndCheckTektonConfig`: - Retrieves the TektonConfig resource from the cluster - Checks its status conditions for readiness - Logs messages for both success and failure cases - Sets an appropriate Ready condition on the ShipwrightBuild resource - Signals the controller to requeue if Tekton is missing or not ready Resolves: shipwright-io#167 Signed-off-by: Hasan Awad <hasan.m.awad94@gmail.com>

adambkaplan · 2025-07-29T13:01:15Z

/hold cancel

We can merge this now that Shipwright v0.16.0 has been released.

adambkaplan · 2025-08-21T14:40:47Z

/retest

adambkaplan · 2025-08-25T12:55:21Z

For some reason GH actions isn't working. Going to close + reopen the PR to see if it fixes the issue.

hasanawad94 · 2025-08-26T08:00:37Z

@adambkaplan I reran the failed actions

adambkaplan

/lgtm

Looks like it is working now, all tests pass!

openshift-ci bot added the release-note label May 11, 2025

pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 11, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 11, 2025

shipwright-ci-bot added this to Issues May 11, 2025

hasanawad94 force-pushed the tektonconfig-check branch 3 times, most recently from 297e2ee to 8b4504c Compare May 12, 2025 07:15

hasanawad94 marked this pull request as ready for review May 12, 2025 07:18

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 12, 2025

openshift-ci bot requested review from HeavyWombat and qu1queee May 12, 2025 07:18

adambkaplan requested changes May 14, 2025

View reviewed changes

controllers/shipwrightbuild_controller.go Show resolved Hide resolved

controllers/shipwrightbuild_controller_test.go Outdated Show resolved Hide resolved

controllers/shipwrightbuild_controller_test.go Show resolved Hide resolved

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2025

hasanawad94 force-pushed the tektonconfig-check branch 2 times, most recently from 6cc8882 to e206635 Compare May 14, 2025 13:14

hasanawad94 requested a review from adambkaplan May 15, 2025 06:44

hasanawad94 marked this pull request as draft May 22, 2025 15:43

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 22, 2025

hasanawad94 force-pushed the tektonconfig-check branch from 9a78c7c to d317fa7 Compare May 23, 2025 12:09

openshift-ci bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed release-note labels May 23, 2025

hasanawad94 marked this pull request as ready for review May 23, 2025 12:11

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 23, 2025

openshift-ci bot requested review from SaschaSchwarze0 and otaviof May 23, 2025 12:11

hasanawad94 changed the title ~~add a check for tektonconfig~~ Add a check for tektonconfig May 23, 2025

adambkaplan reviewed Jun 3, 2025

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2025

hasanawad94 force-pushed the tektonconfig-check branch 2 times, most recently from 39901c5 to 446c6a5 Compare June 10, 2025 11:36

hasanawad94 requested a review from adambkaplan June 10, 2025 11:40

adambkaplan added this to the release-v0.17.0 milestone Jun 10, 2025

adambkaplan reviewed Jun 10, 2025

View reviewed changes

hasanawad94 force-pushed the tektonconfig-check branch from 446c6a5 to d58b19f Compare June 11, 2025 07:58

hasanawad94 requested a review from adambkaplan June 20, 2025 11:14

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 29, 2025

adambkaplan moved this to In Progress in Issues Aug 21, 2025

adambkaplan closed this Aug 25, 2025

github-project-automation bot moved this from In Progress to Done in Issues Aug 25, 2025

adambkaplan reopened this Aug 25, 2025

adambkaplan moved this from Done to In Progress in Issues Aug 26, 2025

adambkaplan approved these changes Aug 26, 2025

View reviewed changes

openshift-ci bot assigned adambkaplan Aug 26, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 26, 2025

openshift-merge-bot bot merged commit e5fde90 into shipwright-io:main Aug 26, 2025
9 of 12 checks passed

github-project-automation bot moved this from In Progress to Done in Issues Aug 26, 2025

openshift-ci bot added release-note and removed release-note-none labels Aug 26, 2025

Conversation

hasanawad94 commented May 11, 2025 • edited by adambkaplan Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Submitter Checklist

Release Notes

Uh oh!

hasanawad94 commented May 11, 2025

Uh oh!

adambkaplan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hasanawad94 commented May 14, 2025

Uh oh!

hasanawad94 commented May 22, 2025

Uh oh!

hasanawad94 commented May 23, 2025

Uh oh!

adambkaplan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

openshift-ci bot commented Jun 3, 2025

Uh oh!

hasanawad94 commented Jun 10, 2025

Uh oh!

adambkaplan commented Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

adambkaplan left a comment

Choose a reason for hiding this comment

Uh oh!

adambkaplan commented Jul 29, 2025

Uh oh!

adambkaplan commented Aug 21, 2025

Uh oh!

adambkaplan commented Aug 25, 2025

Uh oh!

hasanawad94 commented Aug 26, 2025

Uh oh!

adambkaplan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hasanawad94 commented May 11, 2025 •

edited by adambkaplan

Loading

adambkaplan commented Jun 10, 2025 •

edited

Loading