From a5af12ca4a97f1984ba461e58c9f87288d2ee0da Mon Sep 17 00:00:00 2001 From: Sridhar Gaddam Date: Thu, 12 Jun 2025 22:21:50 +0530 Subject: [PATCH] Revert "Disable imageDigest support in ztunnel controller (#582)" This reverts commit c2828738a8ae2b72e5074a0aae79ba8b2158b457. Signed-off-by: Sridhar Gaddam --- controllers/ztunnel/ztunnel_controller.go | 11 +---------- controllers/ztunnel/ztunnel_controller_test.go | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/controllers/ztunnel/ztunnel_controller.go b/controllers/ztunnel/ztunnel_controller.go index 0d11591f9..0c3bd8fed 100644 --- a/controllers/ztunnel/ztunnel_controller.go +++ b/controllers/ztunnel/ztunnel_controller.go @@ -144,16 +144,7 @@ func (r *Reconciler) installHelmChart(ctx context.Context, ztunnel *v1alpha1.ZTu userValues := ztunnel.Spec.Values // apply image digests from configuration, if not already set by user - // TODO: Revisit once we support ImageOverrides for ztunnel - // userValues = applyImageDigests(ztunnel, userValues, config.Config) - - if userValues == nil { - userValues = &v1.ZTunnelValues{} - } - - if userValues.ZTunnel == nil { - userValues.ZTunnel = &v1.ZTunnelConfig{} - } + userValues = applyImageDigests(version, userValues, config.Config) // apply userValues on top of defaultValues from profiles mergedHelmValues, err := istiovalues.ApplyProfilesAndPlatform( diff --git a/controllers/ztunnel/ztunnel_controller_test.go b/controllers/ztunnel/ztunnel_controller_test.go index ae6fe3aeb..d973a82a1 100644 --- a/controllers/ztunnel/ztunnel_controller_test.go +++ b/controllers/ztunnel/ztunnel_controller_test.go @@ -339,8 +339,6 @@ func TestDetermineReadyCondition(t *testing.T) { } func TestApplyImageDigests(t *testing.T) { - t.Skip("https://github.com/istio-ecosystem/sail-operator/issues/581") - testCases := []struct { name string config config.OperatorConfig