@@ -84,15 +84,6 @@ const (
8484 // 1. Sail Library mode: Uninstall Istio if this is the last GatewayClass, then remove finalizer
8585 // 2. Downgrade to OLM: Clean up Sail Library status and finalizer (then OLM takes over Istio)
8686 sailLibraryFinalizer = "openshift.io/ingress-operator-sail-finalizer"
87-
88- // Image configuration for Sail Library installations.
89- // These are only used for defaulting when CSV image annotations are missing,
90- // which should not happen in production clusters with proper OSSM release branches.
91- ossmImageRegistry = "registry.redhat.io/openshift-service-mesh"
92- istioImageIstiod = "istio-pilot-rhel9"
93- istioImageProxy = "istio-proxyv2-rhel9"
94- istioImageCNI = "istio-cni-rhel9"
95- istioImageZTunnel = "istio-ztunnel-rhel9"
9687)
9788
9889var log = logf .Logger .WithName (controllerName )
@@ -168,19 +159,6 @@ func NewUnmanaged(mgr manager.Manager, config Config) (controller.Controller, er
168159 return nil , err
169160 }
170161 } else {
171- // TODO: Remove this when we switch to an OSSM release branch with proper CSV image annotations.
172- // The main branch of sail-operator does not maintain image annotations in the CSV,
173- // causing Istio to fall back to upstream container images. This explicit configuration
174- // ensures Red Hat images are used until the release branch has the annotations properly maintained.
175- err := install .SetImageDefaults (resources .FS , ossmImageRegistry , install.ImageNames {
176- Istiod : istioImageIstiod ,
177- Proxy : istioImageProxy ,
178- CNI : istioImageCNI ,
179- ZTunnel : istioImageZTunnel ,
180- })
181- if err != nil {
182- return nil , fmt .Errorf ("failed to set image defaults: %w" , err )
183- }
184162 // Start the Sail Library's background reconciliation loop (runs in a goroutine).
185163 // Returns a notification channel that signals when library reconciliation completes,
186164 // allowing us to update GatewayClass status conditions accordingly.
0 commit comments