Skip to content

[DONT MERGE] Support konflux mode also with --olm #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mclasmeier wants to merge 2 commits into from
+14 −9
Closed

[DONT MERGE] Support konflux mode also with --olm #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8afc28a
Cleanup konflux image rewriting rules on teardown
May 11, 2026
c6c268a
Hoist konflux image rewriting rules setup up into Deploy() function t…
May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions internal/deployer/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -621,6 +631,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)
Expand Down
9 changes: 0 additions & 9 deletions internal/deployer/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading