From 8afc28a4aea0e1f783f2d6c93bcfd05c2d4c8a8d Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Mon, 11 May 2026 20:07:47 +0200 Subject: [PATCH 1/2] Cleanup konflux image rewriting rules on teardown --- internal/deployer/deployer.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index 69b77c19..b47d4a7e 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -621,6 +621,10 @@ func (d *Deployer) Teardown(ctx context.Context, components component.Component) } } + if err := d.removeKonfluxImageRewriting(ctx); err != nil { + d.logger.Warningf("Error while removing any lingering image rewriting rules for Konflux deployments: %v", err) + } + return nil default: return fmt.Errorf("unknown component: %s", components) From c6c268a874cbd0dabf3c28c4d47850f53f79e536 Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Mon, 11 May 2026 20:08:21 +0200 Subject: [PATCH 2/2] Hoist konflux image rewriting rules setup up into Deploy() function to make it independent of olm/non-olm mode --- internal/deployer/deployer.go | 10 ++++++++++ internal/deployer/operator.go | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go index b47d4a7e..219206f6 100644 --- a/internal/deployer/deployer.go +++ b/internal/deployer/deployer.go @@ -504,6 +504,16 @@ func (d *Deployer) Deploy(ctx context.Context, components component.Component, r d.logger.Infof("Initiating deployment of %s", components) + if d.useKonflux { + if err := d.ensureKonfluxImageRewriting(ctx); err != nil { + return fmt.Errorf("failed to configure Konflux image rewriting: %w", err) + } + } else { + if err := d.removeKonfluxImageRewriting(ctx); err != nil { + return fmt.Errorf("failed to remove Konflux ImageContentSourcePolicy: %w", err) + } + } + // If only deploying operator, use the operator-only flow if components.IncludesOperatorExplicitly() { return d.deployOperatorOnly(ctx) diff --git a/internal/deployer/operator.go b/internal/deployer/operator.go index 10fa5f8b..d3b7d9bd 100644 --- a/internal/deployer/operator.go +++ b/internal/deployer/operator.go @@ -36,15 +36,6 @@ var requiredCRDs = []string{ // deployOperatorNonOLM deploys the RHACS operator without OLM func (d *Deployer) deployOperatorNonOLM(ctx context.Context) error { d.logger.Infof("Operator tag: %s", d.operatorTag) - if d.useKonflux { - if err := d.ensureKonfluxImageRewriting(ctx); err != nil { - return fmt.Errorf("failed to configure Konflux image rewriting: %w", err) - } - } else { - if err := d.removeKonfluxImageRewriting(ctx); err != nil { - return fmt.Errorf("failed to remove Konflux ImageContentSourcePolicy: %v", err) - } - } bundleImage := d.getOperatorBundleImage() bundleDir, err := d.downloadAndExtractOperatorBundle(ctx, bundleImage)