From b0889536ceb5ee3981285e17262e7e271b30e952 Mon Sep 17 00:00:00 2001 From: Grant Spence Date: Thu, 19 Mar 2026 14:55:18 -0400 Subject: [PATCH] OCPBUGS-79667: Use feature-gate annotation for Sail Library RBAC Replace feature-set annotations with the new feature-gate annotation to conditionally deploy Sail Library RBAC based on the GatewayAPI feature gate state. This leverages the new CVO capability (openshift/cluster-version-operator#1273) that applies manifests based on enabled feature gates. The release.openshift.io/feature-gate annotation allows atomic feature promotion without payload adjustments. With this change, the Sail Library RBAC will be deployed when the GatewayAPI feature gate is enabled, eliminating the previous limitation where TechPreview manifests were only included during cluster installation and unavailable on Default clusters even after enabling TechPreviewNoUpgrade. --- manifests/00-cluster-role-sail-library.yaml | 2 +- manifests/01-cluster-role-binding-sail-library.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/00-cluster-role-sail-library.yaml b/manifests/00-cluster-role-sail-library.yaml index 71d4c4f80b..9912d1d677 100644 --- a/manifests/00-cluster-role-sail-library.yaml +++ b/manifests/00-cluster-role-sail-library.yaml @@ -31,7 +31,7 @@ metadata: name: openshift-ingress-operator-sail-library annotations: capability.openshift.io/name: Ingress - release.openshift.io/feature-set: DevPreviewNoUpgrade,TechPreviewNoUpgrade # Remove when GA + release.openshift.io/feature-gate: GatewayAPIWithoutOLM include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" diff --git a/manifests/01-cluster-role-binding-sail-library.yaml b/manifests/01-cluster-role-binding-sail-library.yaml index 467193d47b..10f47823cb 100644 --- a/manifests/01-cluster-role-binding-sail-library.yaml +++ b/manifests/01-cluster-role-binding-sail-library.yaml @@ -7,7 +7,7 @@ metadata: name: openshift-ingress-operator-sail-library annotations: capability.openshift.io/name: Ingress - release.openshift.io/feature-set: DevPreviewNoUpgrade,TechPreviewNoUpgrade # Remove when GA + release.openshift.io/feature-gate: GatewayAPIWithoutOLM include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true"