Skip to content

Commit 96ad9e5

Browse files
committed
Remove SetImageDefaults that overrode CSV image SHAs
Cherry-picked from: b1bbbb7 #1404
1 parent 225197a commit 96ad9e5

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

pkg/operator/controller/gatewayclass/controller.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -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

9889
var log = logf.Logger.WithName(controllerName)
@@ -170,19 +161,6 @@ func NewUnmanaged(mgr manager.Manager, config Config) (controller.Controller, er
170161
return nil, err
171162
}
172163
} else {
173-
// TODO: Remove this when we switch to an OSSM release branch with proper CSV image annotations.
174-
// The main branch of sail-operator does not maintain image annotations in the CSV,
175-
// causing Istio to fall back to upstream container images. This explicit configuration
176-
// ensures Red Hat images are used until the release branch has the annotations properly maintained.
177-
err := install.SetImageDefaults(resources.FS, ossmImageRegistry, install.ImageNames{
178-
Istiod: istioImageIstiod,
179-
Proxy: istioImageProxy,
180-
CNI: istioImageCNI,
181-
ZTunnel: istioImageZTunnel,
182-
})
183-
if err != nil {
184-
return nil, fmt.Errorf("failed to set image defaults: %w", err)
185-
}
186164
// Start the Sail Library's background reconciliation loop (runs in a goroutine).
187165
// Returns a notification channel that signals when library reconciliation completes,
188166
// allowing us to update GatewayClass status conditions accordingly.

0 commit comments

Comments
 (0)