Skip to content

✨ OPRUN-4150: Relax webhook support preconditions #2222

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

Merged
merged 6 commits into from
Sep 19, 2025
Merged

✨ OPRUN-4150: Relax webhook support preconditions #2222

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b72968
Relax webhook preconditions
Sep 16, 2025
1399b50
Fix up WithInstallModeSupportFor to include all install modes
Sep 17, 2025
9e91356
Add CheckConversionWebhookSupport to validator
Sep 17, 2025
42f01b5
Add check for install mode support
Sep 17, 2025
a1a5a58
Update error messages
Sep 17, 2025
362b58e
Remove error sorting by webhook name
Sep 18, 2025
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
23 changes: 14 additions & 9 deletions internal/operator-controller/rukpak/render/registryv1/validators/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,26 @@ func CheckPackageNameNotEmpty(rv1 *bundle.RegistryV1) []error {
return nil
}

// CheckWebhookSupport checks that if the bundle cluster service version declares webhook definitions
// that it is a singleton operator, i.e. that it only supports AllNamespaces mode. This keeps parity
// with OLMv0 behavior for conversion webhooks,
// CheckConversionWebhookSupport checks that if the bundle cluster service version declares conversion webhook definitions,
// that the bundle also only supports AllNamespaces install mode. This keeps parity with OLMv0 behavior for conversion webhooks,
// https://github.com/operator-framework/operator-lifecycle-manager/blob/dfd0b2bea85038d3c0d65348bc812d297f16b8d2/pkg/controller/install/webhook.go#L193
// Since OLMv1 considers APIs to be cluster-scoped, we initially extend this constraint to validating and mutating webhooks.
// While this might restrict the number of supported bundles, we can tackle the issue of relaxing this constraint in turn
// after getting the webhook support working.
func CheckWebhookSupport(rv1 *bundle.RegistryV1) []error {
if len(rv1.CSV.Spec.WebhookDefinitions) > 0 {
func CheckConversionWebhookSupport(rv1 *bundle.RegistryV1) []error {
hasConversionWebhooks := false
for _, wh := range rv1.CSV.Spec.WebhookDefinitions {
if wh.Type == v1alpha1.ConversionWebhook {
hasConversionWebhooks = true
break
}
}

if hasConversionWebhooks {
supportedInstallModes := sets.Set[v1alpha1.InstallModeType]{}
for _, mode := range rv1.CSV.Spec.InstallModes {
supportedInstallModes.Insert(mode.Type)
}
if len(supportedInstallModes) != 1 || !supportedInstallModes.Has(v1alpha1.InstallModeTypeAllNamespaces) {
return []error{errors.New("bundle contains webhook definitions but supported install modes beyond AllNamespaces")}
sortedModes := slices.Sorted(slices.Values(supportedInstallModes.UnsortedList()))
return []error{fmt.Errorf("bundle contains conversion webhooks and supports install modes %v - conversion webhooks are only supported for bundles that only support AllNamespaces install mode", sortedModes)}
}
}

Expand Down
36 changes: 4 additions & 32 deletions internal/operator-controller/rukpak/render/registryv1/validators/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,32 +249,6 @@ func Test_CheckWebhookSupport(t *testing.T) {
bundle *bundle.RegistryV1
expectedErrs []error
}{
{
name: "accepts bundles with validating webhook definitions when they only support AllNamespaces install mode",
bundle: &bundle.RegistryV1{
CSV: MakeCSV(
WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
WithWebhookDefinitions(
v1alpha1.WebhookDescription{
Type: v1alpha1.ValidatingAdmissionWebhook,
},
),
),
},
},
{
name: "accepts bundles with mutating webhook definitions when they only support AllNamespaces install mode",
bundle: &bundle.RegistryV1{
CSV: MakeCSV(
WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
WithWebhookDefinitions(
v1alpha1.WebhookDescription{
Type: v1alpha1.MutatingAdmissionWebhook,
},
),
),
},
},
{
name: "accepts bundles with conversion webhook definitions when they only support AllNamespaces install mode",
bundle: &bundle.RegistryV1{
Expand All @@ -289,7 +263,7 @@ func Test_CheckWebhookSupport(t *testing.T) {
},
},
{
name: "rejects bundles with validating webhook definitions when they support more modes than AllNamespaces install mode",
name: "accepts bundles with validating webhook definitions when they support more modes than AllNamespaces install mode",
bundle: &bundle.RegistryV1{
CSV: MakeCSV(
WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces, v1alpha1.InstallModeTypeSingleNamespace),
Expand All @@ -300,7 +274,6 @@ func Test_CheckWebhookSupport(t *testing.T) {
),
),
},
expectedErrs: []error{errors.New("bundle contains webhook definitions but supported install modes beyond AllNamespaces")},
},
{
name: "accepts bundles with mutating webhook definitions when they support more modes than AllNamespaces install mode",
Expand All @@ -314,10 +287,9 @@ func Test_CheckWebhookSupport(t *testing.T) {
),
),
},
expectedErrs: []error{errors.New("bundle contains webhook definitions but supported install modes beyond AllNamespaces")},
},
{
name: "accepts bundles with conversion webhook definitions when they support more modes than AllNamespaces install mode",
name: "rejects bundles with conversion webhook definitions when they support more modes than AllNamespaces install mode",
bundle: &bundle.RegistryV1{
CSV: MakeCSV(
WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces, v1alpha1.InstallModeTypeSingleNamespace),
Expand All @@ -328,11 +300,11 @@ func Test_CheckWebhookSupport(t *testing.T) {
),
),
},
expectedErrs: []error{errors.New("bundle contains webhook definitions but supported install modes beyond AllNamespaces")},
expectedErrs: []error{errors.New("bundle contains conversion webhooks and supports install modes [AllNamespaces SingleNamespace] - conversion webhooks are only supported for bundles that only support AllNamespaces install mode")},
},
} {
t.Run(tc.name, func(t *testing.T) {
errs := validators.CheckWebhookSupport(tc.bundle)
errs := validators.CheckConversionWebhookSupport(tc.bundle)
require.Equal(t, tc.expectedErrs, errs)
})
}
Expand Down
Loading