Adding FIPS_CLUSTER variable to E2E test by fjglira · Pull Request #1698 · istio-ecosystem/sail-operator

fjglira · 2026-03-17T10:49:05Z

What type of PR is this?

What this PR does / why we need it:

Adding FIPS_CLUSTER will help us to set it to true when we run test on FIPS clusters and skip test on versions under 1.28.x

Which issue(s) this PR fixes:

Fixes #

Related Issue/PR #

Additional information:

Adding FIPS_CLUSTER will help us to set it to true when we run test on FIPS clusters and skip test on versions under 1.28.x Signed-off-by: Francisco Herrera <fjglira@gmail.com>

codecov · 2026-03-17T10:53:42Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 81.16%. Comparing base (0c23a50) to head (0e6bd18).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1698      +/-   ##
==========================================
+ Coverage   81.08%   81.16%   +0.08%     
==========================================
  Files          50       50              
  Lines        2490     2490              
==========================================
+ Hits         2019     2021       +2     
+ Misses        348      347       -1     
+ Partials      123      122       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

istio-testing · 2026-03-17T12:25:45Z

In response to a cherrypick label: #1698 failed to apply on top of branch "release-1.27":

Applying: Adding FIPS_CLUSTER variable to E2E test
Using index info to reconstruct a base tree...
M	tests/e2e/ambient/ambient_suite_test.go
M	tests/e2e/ambient/ambient_test.go
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
Auto-merging tests/e2e/ambient/ambient_test.go
Auto-merging tests/e2e/ambient/ambient_suite_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adding FIPS_CLUSTER variable to E2E test

istio-testing · 2026-03-17T12:25:47Z

In response to a cherrypick label: new issue created for failed cherrypick: #1700

istio-testing · 2026-03-17T12:26:23Z

In response to a cherrypick label: #1698 failed to apply on top of branch "release-1.28":

Applying: Adding FIPS_CLUSTER variable to E2E test
Using index info to reconstruct a base tree...
M	tests/e2e/ambient/ambient_suite_test.go
M	tests/e2e/ambient/ambient_test.go
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
Auto-merging tests/e2e/ambient/ambient_test.go
Auto-merging tests/e2e/ambient/ambient_suite_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adding FIPS_CLUSTER variable to E2E test

istio-testing · 2026-03-17T12:26:23Z

In response to a cherrypick label: #1698 failed to apply on top of branch "release-1.27":

Applying: Adding FIPS_CLUSTER variable to E2E test
Using index info to reconstruct a base tree...
M	tests/e2e/ambient/ambient_suite_test.go
M	tests/e2e/ambient/ambient_test.go
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
Auto-merging tests/e2e/ambient/ambient_test.go
Auto-merging tests/e2e/ambient/ambient_suite_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adding FIPS_CLUSTER variable to E2E test

istio-testing · 2026-03-17T12:26:25Z

In response to a cherrypick label: new issue created for failed cherrypick: #1702

istio-testing · 2026-03-17T12:26:25Z

In response to a cherrypick label: new issue created for failed cherrypick: #1701

istio-testing · 2026-03-17T12:27:01Z

In response to a cherrypick label: #1698 failed to apply on top of branch "release-1.28":

Applying: Adding FIPS_CLUSTER variable to E2E test
Using index info to reconstruct a base tree...
M	tests/e2e/ambient/ambient_suite_test.go
M	tests/e2e/ambient/ambient_test.go
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
Auto-merging tests/e2e/ambient/ambient_test.go
Auto-merging tests/e2e/ambient/ambient_suite_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Adding FIPS_CLUSTER variable to E2E test

istio-testing · 2026-03-17T12:27:03Z

In response to a cherrypick label: new issue created for failed cherrypick: #1703

Adding FIPS_CLUSTER will help us to set it to true when we run test on FIPS clusters and skip test on versions under 1.28.x Signed-off-by: Francisco Herrera <fjglira@gmail.com>

Adding FIPS_CLUSTER will help us to set it to true when we run test on FIPS clusters and skip test on versions under 1.28.x Signed-off-by: Francisco Herrera <fjglira@gmail.com> Co-authored-by: Francisco Herrera <fjglira@gmail.com>

* upstream/release-1.27: Adding FIPS_CLUSTER variable to E2E test (istio-ecosystem#1698) (istio-ecosystem#1705)

* upstream/main: Adding FIPS_CLUSTER variable to E2E test (istio-ecosystem#1698) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1696) Fix commit check workflow to only check the first PR commit (istio-ecosystem#1692) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1693) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1691) Fix infinite reconcile loop when Istio version is EOL (istio-ecosystem#1690) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1688) Give agents instructions on finalizing a change. (istio-ecosystem#1653) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1685) fix: write correct helm value for FIPS-140-2 support (istio-ecosystem#1681) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1672) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1668) Fix missing MaxConcurrentReconciles in ZTunnel controller (istio-ecosystem#1661)

* upstream/release-1.28: [release-1.28] Migrate to fs.FS as the sole resource loading interface (istio-ecosystem#1594) Adding FIPS_CLUSTER variable to E2E test (istio-ecosystem#1698) (istio-ecosystem#1704)

Adding FIPS_CLUSTER variable to E2E test

0e6bd18

Adding FIPS_CLUSTER will help us to set it to true when we run test on FIPS clusters and skip test on versions under 1.28.x Signed-off-by: Francisco Herrera <fjglira@gmail.com>

fjglira requested a review from a team as a code owner March 17, 2026 10:49

istio-testing added the size/XS label Mar 17, 2026

mkralik3 approved these changes Mar 17, 2026

View reviewed changes

sridhargaddam approved these changes Mar 17, 2026

View reviewed changes

istio-testing merged commit 4d758e0 into istio-ecosystem:main Mar 17, 2026
17 checks passed

mkralik3 added cherrypick/release-1.27 cherrypick/release-1.28 labels Mar 17, 2026

istio-testing mentioned this pull request Mar 17, 2026

[release-1.27] Adding FIPS_CLUSTER variable to E2E test #1700

Closed

This was referenced Mar 17, 2026

[release-1.28] Adding FIPS_CLUSTER variable to E2E test #1701

Closed

[release-1.27] Adding FIPS_CLUSTER variable to E2E test #1702

Closed

istio-testing mentioned this pull request Mar 17, 2026

[release-1.28] Adding FIPS_CLUSTER variable to E2E test #1703

Closed

openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Mar 17, 2026

Automated merge

4741bf1

* upstream/release-1.27: Adding FIPS_CLUSTER variable to E2E test (istio-ecosystem#1698) (istio-ecosystem#1705)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding FIPS_CLUSTER variable to E2E test#1698

Adding FIPS_CLUSTER variable to E2E test#1698
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
fjglira:skip-fips

fjglira commented Mar 17, 2026

Uh oh!

codecov bot commented Mar 17, 2026 •

edited

Loading

Uh oh!

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

fjglira commented Mar 17, 2026

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Additional information:

Uh oh!

codecov bot commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

istio-testing commented Mar 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Mar 17, 2026 •

edited

Loading