Skip to content

[release-1.26] Revert: Disable imageDigest support in ztunnel controller #915

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
istio-testing merged 1 commit into from
Jun 17, 2025
Merged

[release-1.26] Revert: Disable imageDigest support in ztunnel controller #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions controllers/ztunnel/ztunnel_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,7 @@
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)

Check warning on line 147 in controllers/ztunnel/ztunnel_controller.go

View check run for this annotation

Codecov / codecov/patch

controllers/ztunnel/ztunnel_controller.go#L147 

Added line #L147 was not covered by tests

// apply userValues on top of defaultValues from profiles
mergedHelmValues, err := istiovalues.ApplyProfilesAndPlatform(
Expand Down
2 changes: 0 additions & 2 deletions controllers/ztunnel/ztunnel_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down