Merge changes from upstream release-1.26 branch#365
Merged
openshift-merge-bot[bot] merged 5 commits intoopenshift-service-mesh:release-3.1from Jun 27, 2025
Merged
Conversation
…-ecosystem#945) Fixes istio-ecosystem#917. This is quite a complex edge case, I'll do my best to explain. If you look at the integration test I wrote (part of this commit), you can follow along. When a tag was created that referenced a revision in ns1, then patched to reference a revision in ns2, we failed to clean up the old helm install in ns1. That almost never causes problems - except in the case where afterwards, you remove all tags, and then create a new one with the same name that is never reconciled. If that tag is deleted, the operator will attempt to uninstall that lingering helm release, which fails, leading the operator to deadlock, and stopping the user from deleting the tag. The only way to get the operator back into a working state would be to manually delete that lingering helm release. That is a pretty significant bug in my opinion. Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com>
…tem#924) (istio-ecosystem#947) During deployment of Istio in ambient mode, the user should be able to set the "profile: ambient" for Istio and IstioCNI resources. Currently, this parameter is hidden from the UI. Turn on the visibility of this parameter in the UI. Signed-off-by: Maxim Babushkin <mbabushk@redhat.com>
…ecosystem#948) * Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902) Now that we have `Cleaner` clean up after each test, it makes sense to run this logic once in the suite, rather than after each test (which cleans up its own resources). Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> * Fix typo in the ReportAfterSuite text (istio-ecosystem#911) Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com> * Fix helm issue during e2e test run operator installation (istio-ecosystem#914) * Fix helm issue during e2e test run operator installation Signed-off-by: Francisco H <frherrer@redhat.com> Fix command error Signed-off-by: Francisco H <frherrer@redhat.com> * Apply suggestions from code review Co-authored-by: Mike Kolesnik <mkolesni@redhat.com> Signed-off-by: Francisco H <frherrer@redhat.com> * Improves from code review Signed-off-by: Francisco H <frherrer@redhat.com> * Update comment in build and push script Signed-off-by: Francisco H <frherrer@redhat.com> --------- Signed-off-by: Francisco H <frherrer@redhat.com> Co-authored-by: Mike Kolesnik <mkolesni@redhat.com> * Consolidate e2e resource creation (istio-ecosystem#931) * Consolidate IstioCNI creation in e2e tests This code is very repetitive and would better live in a common function. Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> * Consolidate Istio creation in e2e tests This code is very repetitive and would better live in a common function. Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> --------- Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> * Use `Eventually` in remote secret generation (istio-ecosystem#921) In this test the secret generation sometimes is attempted before everything is ready, leading to flaky, hard to debug, failures. Using `Eventually` to generate the secret avoids these failures. Fixes: istio-ecosystem#866 Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> --------- Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com> Signed-off-by: Francisco H <frherrer@redhat.com> Co-authored-by: Mike Kolesnik <mkolesni@redhat.com> Co-authored-by: Sridhar Gaddam <sgaddam@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
Closed
dgn
approved these changes
Jun 27, 2025
openshift-merge-bot
bot
merged commit 5d6cc8e
into
openshift-service-mesh:release-3.1
9 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Related Issue/PR #
Additional information: