Skip to content

Conversation

@hasanawad94
Copy link
Contributor

@hasanawad94 hasanawad94 commented Nov 26, 2025

Changes

  • Removed TektonConfig and cert-manager API dependencies from CSV files
  • Updated documentation
  • Fixed unit tests: Added CRD establishment wait and Switched to controller-runtime client
  • Updated the e2e test script (hack/run-operator-catalog.sh) to install Tekton and cert-manager before creating the ShipwrightBuild.

#270

Submitter Checklist

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

Release Notes

Removed TektonConfig and cert-manager OLM dependencies

@hasanawad94 hasanawad94 added this to the release-v0.18.0 milestone Nov 26, 2025
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 26, 2025
@hasanawad94 hasanawad94 marked this pull request as draft November 26, 2025 08:58
@openshift-ci 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 Nov 26, 2025
@hasanawad94 hasanawad94 force-pushed the remove-tektonconfig-cert branch from 434ba0a to 9bbbd14 Compare November 26, 2025 09:09
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 26, 2025
@hasanawad94 hasanawad94 force-pushed the remove-tektonconfig-cert branch from 9bbbd14 to b9b7e37 Compare November 26, 2025 09:25
Fixed unit tests: Added CRD establishment wait and Switched to controller-runtime client
Updated the e2e test script (hack/run-operator-catalog.sh) to install Tekton and cert-manager before creating the ShipwrightBuild.

Signed-off-by: Hasan Awad <[email protected]>
@hasanawad94 hasanawad94 force-pushed the remove-tektonconfig-cert branch from b9b7e37 to eac8bf1 Compare November 26, 2025 09:34
@hasanawad94 hasanawad94 marked this pull request as ready for review November 26, 2025 09:36
@openshift-ci 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 Nov 26, 2025
Copy link
Member

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

/approve

Looks fantastic! I identified one "nice to have"/follow up item that IMO shouldn't block merge. The e2e test is passing, which is good enough for me.

Comment on lines +44 to +49
## Prerequisites
Before installing the Shipwright operator, ensure the following components are installed:
- **Tekton**: Follow the [Tekton installation instructions](https://tekton.dev/docs/setup/) to install Tekton Pipelines.
- **cert-manager**: Follow the [cert-manager installation instructions](https://cert-manager.io/docs/installation/) to install cert-manager for webhook certificate provisioning.
Copy link
Member

Choose a reason for hiding this comment

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

👍 - we can't rely on Operator Lifecycle Manager to install these with this change.

We will also need to update the "Getting Started" instructions once we get the release working on OperatorHub.

Comment on lines +129 to +142

// Wait for the CRD to be established before proceeding
Eventually(func() bool {
crd := &crdv1.CustomResourceDefinition{}
if err := k8sClient.Get(ctx, types.NamespacedName{Name: "tektonconfigs.operator.tekton.dev"}, crd); err != nil {
return false
}
for _, condition := range crd.Status.Conditions {
if condition.Type == crdv1.Established && condition.Status == crdv1.ConditionTrue {
return true
}
}
return false
}).Should(BeTrue(), "TektonConfig CRD should be established")
Copy link
Member

Choose a reason for hiding this comment

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

Should we also do this for the cert-manager Issuer or Certificate CRDs? I think we can address this in a follow-up PR if needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good looking out. I’ll look into this in a future pr

Comment on lines +208 to +209
// Use controller-runtime client instead of REST client for better compatibility with envtest
err := k8sClient.Create(ctx, tektonConfig, &client.CreateOptions{})
Copy link
Member

Choose a reason for hiding this comment

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

👍 - thank you for this! Much needed payoff for old tech debt.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 1, 2025

[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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 1, 2025
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 14594c0 into shipwright-io:main Dec 1, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. release-note size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants