Skip to content

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.2 #725

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
openshift-merge-bot merged 2 commits into from
Mar 17, 2026
Merged

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.2 #725

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
1788ba1
Adding FIPS_CLUSTER variable to E2E test (#1698) (#1705)
mkralik3 Mar 17, 2026
4741bf1
Automated merge
Mar 17, 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
1 change: 1 addition & 0 deletions tests/e2e/ambient/ambient_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var (
expectedRegistry = env.Get("EXPECTED_REGISTRY", "^docker\\.io|^gcr\\.io")
multicluster = env.GetBool("MULTICLUSTER", false)
keepOnFailure = env.GetBool("KEEP_ON_FAILURE", false)
fipsCluster = env.GetBool("FIPS_CLUSTER", false)

k kubectl.Kubectl
)
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/ambient/ambient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ var _ = Describe("Ambient configuration ", Label("smoke", "ambient"), Ordered, f
continue
}

// FIPS clusters do not support ambient mode for versions below 1.28
if fipsCluster && version.Version.LessThan(semver.MustParse("1.28.0")) {
continue
}

Context(fmt.Sprintf("Istio version %s", version.Version), func() {
clr := cleaner.New(cl)
BeforeAll(func(ctx SpecContext) {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/common-operator-integ-suite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ if [ "${SKIP_BUILD}" == "false" ]; then
fi
fi

export SKIP_DEPLOY IP_FAMILY ISTIO_MANIFEST NAMESPACE CONTROL_PLANE_NS DEPLOYMENT_NAME MULTICLUSTER ARTIFACTS ISTIO_NAME COMMAND KUBECONFIG ISTIOCTL_PATH GINKGO_FLAGS
export SKIP_DEPLOY IP_FAMILY ISTIO_MANIFEST NAMESPACE CONTROL_PLANE_NS DEPLOYMENT_NAME MULTICLUSTER ARTIFACTS ISTIO_NAME COMMAND KUBECONFIG ISTIOCTL_PATH GINKGO_FLAGS FIPS_CLUSTER

if [ "${OLM}" != "true" ] && [ "${SKIP_DEPLOY}" != "true" ]; then
# shellcheck disable=SC2153
Expand Down