Skip to content
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.

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

Red Hat Konflux update osc-caa #14

Merged
merged 3 commits into from
Feb 14, 2025
Merged

Red Hat Konflux update osc-caa #14

merged 3 commits into from
Feb 14, 2025

Conversation

red-hat-konflux[bot]
Copy link

Pipelines as Code configuration proposal

To start the PipelineRun, add a new comment with content /ok-to-test

For more detailed information about running a PipelineRun, please refer to Pipelines as Code documentation Running the PipelineRun

To customize the proposed PipelineRuns after merge, please refer to Build Pipeline customization

@littlejawa
Copy link

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Feb 6, 2025
@littlejawa littlejawa force-pushed the appstudio-osc-caa branch 3 times, most recently from 7d8062b to 3f8b192 Compare February 7, 2025 14:00
@spotlesstofu
Copy link

There is no need to support iptables-wrapper. You can cherry-pick my commit here, or reproduce it yourself.

@littlejawa
Copy link

Seems like we have something that builds !
Let's confirm we can drop the iptable-wrappers, then we can merge

@spotlesstofu
Copy link

@littlejawa your latest commit ace242e overwrites what you did with 3628d91.
Could you delete that subscription block, or comment out the original one?

@littlejawa littlejawa force-pushed the appstudio-osc-caa branch 2 times, most recently from 257e3ad to dc31262 Compare February 12, 2025 16:26
@littlejawa
Copy link

I'm removing iptables from the release image, to be consistent with what we are doing on the CPaaS builds.
The idea is that we are using nftables, and cloud-api-adaptor will use it through the iptables-nft interface.

red-hat-konflux and others added 3 commits February 14, 2025 14:56
Signed-off-by: red-hat-konflux <[email protected]>
We need to enable the CRB in the builder image, but this requires managing
the subscription too.
The activation key and org ID are already available to us through a mount file,
so we should be able to use them.

Making the same change in the release image, but commenting it out, as it seems
the subscription is already done, and calling it again breaks the build.
Keeping it as comments for local builds.

Signed-off-by: Julien Ropé <[email protected]>
We don't need it on RHEL because we know the iptables mode we support,
nft.

The wrapper provides an easy way to support both "legacy" and "nft"
modes when you don't know the system the container will run in.

RHEL only supports nft, so there is no point in supporting legacy
through the wrapper.

See docs at
https://github.com/kubernetes-sigs/iptables-wrappers
@littlejawa littlejawa merged commit 875f9bb into osc-release Feb 14, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants