Skip to content

Enable TLSv1.2 for ZTunnel when in FIPS mode #1547

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 2 commits into from
Feb 12, 2026
Merged

Enable TLSv1.2 for ZTunnel when in FIPS mode #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74932ae
Enable TLSv1.2 for ZTunnel when in FIPS mode
dgn Jan 27, 2026
9c6d75f
Make sure that FipsEnabled is restored to original value
dgn Feb 11, 2026
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
10 changes: 10 additions & 0 deletions pkg/istiovalues/fips.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,13 @@ func ApplyFipsValues(values helm.Values) (helm.Values, error) {
}
return values, nil
}

// ApplyZTunnelFipsValues sets value ztunnel.env.TLS12_ENABLED if FIPS mode is enabled in the system.
func ApplyZTunnelFipsValues(values helm.Values) (helm.Values, error) {
if FipsEnabled {
if err := values.SetIfAbsent("ztunnel.env.TLS12_ENABLED", "true"); err != nil {
return nil, fmt.Errorf("failed to set ztunnel.env.TLS12_ENABLED: %w", err)
}
}
return values, nil
}
45 changes: 45 additions & 0 deletions pkg/istiovalues/fips_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ func TestApplyFipsValues(t *testing.T) {
values := helm.Values{}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
originalFipsEnabled := FipsEnabled
t.Cleanup(func() { FipsEnabled = originalFipsEnabled })
FipsEnabled = tt.fipsEnabled
actual, err := ApplyFipsValues(values)
if (err != nil) != tt.expectErr {
Expand All @@ -101,3 +103,46 @@ func TestApplyFipsValues(t *testing.T) {
})
}
}

func TestApplyZTunnelFipsValues(t *testing.T) {
tests := []struct {
name string
fipsEnabled bool
expectValues helm.Values
expectErr bool
}{
{
name: "FIPS not enabled",
fipsEnabled: false,
expectValues: helm.Values{},
},
{
name: "FIPS enabled",
fipsEnabled: true,
expectValues: helm.Values{
"ztunnel": map[string]any{
"env": map[string]any{"TLS12_ENABLED": string("true")},
},
},
},
}

values := helm.Values{}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
originalFipsEnabled := FipsEnabled
t.Cleanup(func() { FipsEnabled = originalFipsEnabled })
FipsEnabled = tt.fipsEnabled
Copy link
Copy Markdown
Contributor

@sridhargaddam sridhargaddam Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FipsEnabled seems to be a global variable and we are mutating its state. I think we should restore its state to the original value after calling ApplyZTunnelFipsValues.

Copy link
Copy Markdown
Collaborator Author

@dgn dgn Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a separate commit for that, PTAL

actual, err := ApplyZTunnelFipsValues(values)
if (err != nil) != tt.expectErr {
t.Errorf("applyFipsValues() error = %v, expectErr %v", err, tt.expectErr)
}

if err == nil {
if diff := cmp.Diff(tt.expectValues, actual); diff != "" {
t.Errorf("TLS12_ENABLED env wasn't applied properly; diff (-expected, +actual):\n%v", diff)
}
}
})
}
}
6 changes: 6 additions & 0 deletions pkg/reconcile/ztunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ func (r *ZTunnelReconciler) ComputeValues(version string, userValues *v1.ZTunnel
return nil, fmt.Errorf("failed to apply profile: %w", err)
}

// apply fips values
mergedHelmValues, err = istiovalues.ApplyZTunnelFipsValues(mergedHelmValues)
if err != nil {
return nil, fmt.Errorf("failed to apply FIPS values: %w", err)
}

// Apply any user Overrides configured as part of values.ztunnel
// This step was not required for the IstioCNI resource because the Helm templates[*] automatically override values.cni
// [*]https://github.com/istio/istio/blob/0200fd0d4c3963a72f36987c2e8c2887df172abf/manifests/charts/istio-cni/templates/zzy_descope_legacy.yaml#L3
Expand Down
2 changes: 2 additions & 0 deletions pkg/revision/values_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ apiVersion: sailoperator.io/v1
kind: IstioRevision
spec:`)), 0o644))

originalFipsEnabled := istiovalues.FipsEnabled
t.Cleanup(func() { istiovalues.FipsEnabled = originalFipsEnabled })
istiovalues.FipsEnabled = true
values := &v1.Values{}
result, err := ComputeValues(values, namespace, version, config.PlatformOpenShift, "default", "",
Expand Down
Loading