Automator: merge upstream changes to openshift-service-mesh/sail-operator@main#618
Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift-service-mesh:mainfrom Dec 3, 2025
Conversation
This commit fixes substantial content changes that were incorrectly introduced during the markdown to AsciiDoc migration in commit e823206. The fixes restore missing content and correct broken links while preserving all changes made after the migration commit. Changes in docs/README.adoc: - Fix broken internal link: changed guidelines.md to guidelines.adoc Changes in docs/deployment-models/multicluster.adoc: Primary-Remote - Single-Network section: - Restore missing 'externalIstiod: true' in Istio resource on cluster1 - Restore missing step 2: Create east-west gateway on cluster1 - Restore missing step 3: Expose istiod on cluster1 - Fix remotePilotAddress: use istio-eastwestgateway ClusterIP instead of istiod LoadBalancer IP - Restore missing istiodRemote.injectionPath configuration - Restore missing step 5: Set control plane cluster annotation - Fix remote secret name: change from 'cluster2' to 'remote' - Restore missing kind-specific instructions for REMOTE_CONTAINER_IP - Fix external links: restore primary-remote/ URLs (removed _single-network) - Fix verification steps: restore single curl commands (removed loops) - Fix cleanup order to match original - Fix wait command format to match original (inline with apply) Primary-Remote - Multi-Network section: - Remove incorrectly added network label command - Fix step title to match original All fixes preserve later changes (e.g., version updates from commit d2cbd96) and only revert unwanted changes from the migration commit. Refs: e823206 Fixes: istio-ecosystem#1373 Signed-off-by: Mike Kolesnik <mkolesni@redhat.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
openshift-service-mesh-bot
force-pushed
the
none-main-merge_upstream_main-38a843ce
branch
from
2d9fc5e to
4f29d11
Compare
* upstream/main: fix(docs): Restore lost content from migration (istio-ecosystem#1418)
openshift-service-mesh-bot
force-pushed
the
none-main-merge_upstream_main-38a843ce
branch
from
4f29d11 to
889f1b7
Compare
openshift-merge-bot
bot
merged commit 2a6ca6a
into
openshift-service-mesh:main
8 checks passed
unsortedhashsets
pushed a commit
to unsortedhashsets/sail-operator
that referenced
this pull request
Jan 28, 2026
Currently, when any ambient e2e test fails, we are not capturing details of the ztunnel and the associated test pods. This PR updates the code to include this info. Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>
unsortedhashsets
pushed a commit
to unsortedhashsets/sail-operator
that referenced
this pull request
Jan 28, 2026
* upstream-eco/main: (27 commits) Add documentation for version alias (openshift-service-mesh#625) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#624) Capture ztunnel details on e2e failures (openshift-service-mesh#618) [Doc] Updates to dual-stack section (openshift-service-mesh#621) Add multi control plane e2e tests (openshift-service-mesh#610) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#620) Add workflow to detect broken links in doc (openshift-service-mesh#611) Add an e2e test for Ambient config in IstioCNI (openshift-service-mesh#591) Use gcr.io for Istio images and quay.io/sail-dev for sample applications (openshift-service-mesh#613) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#612) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#609) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#608) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#606) Helm: Remove redundant platform-specific cmd during installation (openshift-service-mesh#604) add trigger for nightly builds of release-1.0 bump version to 1.1.0 Update ztunnel comment in api_transformer (openshift-service-mesh#595) Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#599) link ambient doc in the doc/table of contents (openshift-service-mesh#598) Add an Ambient mode documentation (openshift-service-mesh#579) ... # Conflicts: # bundle/manifests/sailoperator.clusterserviceversion.yaml # resources/latest/charts/base/Chart.yaml # resources/latest/charts/cni/Chart.yaml # resources/latest/charts/cni/values.yaml # resources/latest/charts/gateway/Chart.yaml # resources/latest/charts/gateway/templates/deployment.yaml # resources/latest/charts/istiod/Chart.yaml # resources/latest/charts/istiod/values.yaml # resources/latest/charts/revisiontags/values.yaml # resources/latest/charts/ztunnel/Chart.yaml # resources/latest/charts/ztunnel/values.yaml # resources/latest/profiles/ambient.yaml # resources/latest/profiles/default.yaml # resources/latest/profiles/demo.yaml # resources/latest/profiles/empty.yaml # resources/latest/profiles/openshift-ambient.yaml # resources/latest/profiles/openshift.yaml # resources/latest/profiles/preview.yaml # resources/latest/profiles/remote.yaml # resources/latest/profiles/stable.yaml # resources/v1.21.6/charts/cni/values.yaml # resources/v1.21.6/charts/istiod/values.yaml # resources/v1.21.6/charts/revisiontags/values.yaml # resources/v1.21.6/charts/ztunnel/values.yaml # resources/v1.21.6/profiles/ambient.yaml # resources/v1.21.6/profiles/default.yaml # resources/v1.21.6/profiles/demo.yaml # resources/v1.21.6/profiles/empty.yaml # resources/v1.21.6/profiles/external.yaml # resources/v1.21.6/profiles/openshift.yaml # resources/v1.21.6/profiles/preview.yaml # resources/v1.21.6/profiles/remote.yaml # resources/v1.22.5/charts/cni/values.yaml # resources/v1.22.5/charts/istiod/values.yaml # resources/v1.22.5/charts/revisiontags/values.yaml # resources/v1.22.5/charts/ztunnel/values.yaml # resources/v1.22.5/profiles/ambient.yaml # resources/v1.22.5/profiles/default.yaml # resources/v1.22.5/profiles/demo.yaml # resources/v1.22.5/profiles/empty.yaml # resources/v1.22.5/profiles/openshift-ambient.yaml # resources/v1.22.5/profiles/openshift.yaml # resources/v1.22.5/profiles/preview.yaml # resources/v1.22.5/profiles/remote.yaml # resources/v1.22.5/profiles/stable.yaml # resources/v1.22.6/charts/cni/values.yaml # resources/v1.22.6/charts/istiod/values.yaml # resources/v1.22.6/charts/revisiontags/values.yaml # resources/v1.22.6/charts/ztunnel/values.yaml # resources/v1.22.6/profiles/ambient.yaml # resources/v1.22.6/profiles/default.yaml # resources/v1.22.6/profiles/demo.yaml # resources/v1.22.6/profiles/empty.yaml # resources/v1.22.6/profiles/openshift-ambient.yaml # resources/v1.22.6/profiles/openshift.yaml # resources/v1.22.6/profiles/preview.yaml # resources/v1.22.6/profiles/remote.yaml # resources/v1.22.6/profiles/stable.yaml # resources/v1.22.7/charts/cni/values.yaml # resources/v1.22.7/charts/istiod/values.yaml # resources/v1.22.7/charts/revisiontags/values.yaml # resources/v1.22.7/charts/ztunnel/values.yaml # resources/v1.22.7/profiles/ambient.yaml # resources/v1.22.7/profiles/default.yaml # resources/v1.22.7/profiles/demo.yaml # resources/v1.22.7/profiles/empty.yaml # resources/v1.22.7/profiles/openshift-ambient.yaml # resources/v1.22.7/profiles/openshift.yaml # resources/v1.22.7/profiles/preview.yaml # resources/v1.22.7/profiles/remote.yaml # resources/v1.22.7/profiles/stable.yaml # resources/v1.22.8/charts/cni/values.yaml # resources/v1.22.8/charts/istiod/values.yaml # resources/v1.22.8/charts/revisiontags/values.yaml # resources/v1.22.8/charts/ztunnel/values.yaml # resources/v1.22.8/profiles/ambient.yaml # resources/v1.22.8/profiles/default.yaml # resources/v1.22.8/profiles/demo.yaml # resources/v1.22.8/profiles/empty.yaml # resources/v1.22.8/profiles/openshift-ambient.yaml # resources/v1.22.8/profiles/openshift.yaml # resources/v1.22.8/profiles/preview.yaml # resources/v1.22.8/profiles/remote.yaml # resources/v1.22.8/profiles/stable.yaml # resources/v1.23.2/charts/cni/values.yaml # resources/v1.23.2/charts/istiod-remote/values.yaml # resources/v1.23.2/charts/istiod/values.yaml # resources/v1.23.2/charts/revisiontags/values.yaml # resources/v1.23.2/charts/ztunnel/values.yaml # resources/v1.23.2/profiles/ambient.yaml # resources/v1.23.2/profiles/default.yaml # resources/v1.23.2/profiles/demo.yaml # resources/v1.23.2/profiles/empty.yaml # resources/v1.23.2/profiles/openshift-ambient.yaml # resources/v1.23.2/profiles/openshift.yaml # resources/v1.23.2/profiles/preview.yaml # resources/v1.23.2/profiles/remote.yaml # resources/v1.23.2/profiles/stable.yaml # resources/v1.23.3/charts/cni/values.yaml # resources/v1.23.3/charts/istiod-remote/values.yaml # resources/v1.23.3/charts/istiod/values.yaml # resources/v1.23.3/charts/revisiontags/values.yaml # resources/v1.23.3/charts/ztunnel/values.yaml # resources/v1.23.3/profiles/ambient.yaml # resources/v1.23.3/profiles/default.yaml # resources/v1.23.3/profiles/demo.yaml # resources/v1.23.3/profiles/empty.yaml # resources/v1.23.3/profiles/openshift-ambient.yaml # resources/v1.23.3/profiles/openshift.yaml # resources/v1.23.3/profiles/preview.yaml # resources/v1.23.3/profiles/remote.yaml # resources/v1.23.3/profiles/stable.yaml # resources/v1.23.4/charts/cni/values.yaml # resources/v1.23.4/charts/istiod-remote/values.yaml # resources/v1.23.4/charts/istiod/values.yaml # resources/v1.23.4/charts/revisiontags/values.yaml # resources/v1.23.4/charts/ztunnel/values.yaml # resources/v1.23.4/profiles/ambient.yaml # resources/v1.23.4/profiles/default.yaml # resources/v1.23.4/profiles/demo.yaml # resources/v1.23.4/profiles/empty.yaml # resources/v1.23.4/profiles/openshift-ambient.yaml # resources/v1.23.4/profiles/openshift.yaml # resources/v1.23.4/profiles/preview.yaml # resources/v1.23.4/profiles/remote.yaml # resources/v1.23.4/profiles/stable.yaml # resources/v1.24.0/charts/cni/values.yaml # resources/v1.24.0/charts/istiod/values.yaml # resources/v1.24.0/charts/revisiontags/values.yaml # resources/v1.24.0/charts/ztunnel/values.yaml # resources/v1.24.0/profiles/ambient.yaml # resources/v1.24.0/profiles/default.yaml # resources/v1.24.0/profiles/demo.yaml # resources/v1.24.0/profiles/empty.yaml # resources/v1.24.0/profiles/openshift-ambient.yaml # resources/v1.24.0/profiles/openshift.yaml # resources/v1.24.0/profiles/preview.yaml # resources/v1.24.0/profiles/remote.yaml # resources/v1.24.0/profiles/stable.yaml # resources/v1.24.1/charts/cni/values.yaml # resources/v1.24.1/charts/istiod/values.yaml # resources/v1.24.1/charts/revisiontags/values.yaml # resources/v1.24.1/charts/ztunnel/values.yaml # resources/v1.24.1/profiles/ambient.yaml # resources/v1.24.1/profiles/default.yaml # resources/v1.24.1/profiles/demo.yaml # resources/v1.24.1/profiles/empty.yaml # resources/v1.24.1/profiles/openshift-ambient.yaml # resources/v1.24.1/profiles/openshift.yaml # resources/v1.24.1/profiles/preview.yaml # resources/v1.24.1/profiles/remote.yaml # resources/v1.24.1/profiles/stable.yaml
dcillera
pushed a commit
to dcillera/sail-operator
that referenced
this pull request
Mar 19, 2026
…penshift-service-mesh#683) * e2e revisiontag (openshift-service-mesh#656) * Control plane update and IstioRevisionTag e2e test Signed-off-by: Francisco H <frherrer@redhat.com> Uncomment cleanup Signed-off-by: Francisco H <frherrer@redhat.com> Update clean up Signed-off-by: Francisco H <frherrer@redhat.com> Fix lint Signed-off-by: Francisco H <frherrer@redhat.com> Fix cleanup e2e test Signed-off-by: Francisco H <frherrer@redhat.com> Update cleanup Signed-off-by: Francisco H <frherrer@redhat.com> * Use istioversion in update test Signed-off-by: Francisco H <frherrer@redhat.com> * Update from review Signed-off-by: Francisco H <frherrer@redhat.com> * Solve from conflicts Signed-off-by: Francisco H <frherrer@redhat.com> * Update from review Signed-off-by: Francisco H <frherrer@redhat.com> * Fix comment on istiorevision test Signed-off-by: Francisco H <frherrer@redhat.com> --------- Signed-off-by: Francisco H <frherrer@redhat.com> * Capture ztunnel details on e2e failures (openshift-service-mesh#618) Currently, when any ambient e2e test fails, we are not capturing details of the ztunnel and the associated test pods. This PR updates the code to include this info. Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com> --------- Signed-off-by: Francisco H <frherrer@redhat.com> Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com> Co-authored-by: Sridhar Gaddam <sgaddam@redhat.com>
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
2 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.
Generated by Automator - 2025-12-03T00:05:16+00:00