Skip to content

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

Merged
openshift-merge-bot[bot] merged 2 commits intoopenshift-service-mesh:release-3.1from
openshift-service-mesh-bot:none-release-3.1-merge_upstream_release-1.26-084b82ec
Dec 10, 2025
Merged

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.1#625
openshift-merge-bot[bot] merged 2 commits intoopenshift-service-mesh:release-3.1from
openshift-service-mesh-bot:none-release-3.1-merge_upstream_release-1.26-084b82ec

Conversation

@openshift-service-mesh-bot
Copy link
Copy Markdown

@openshift-service-mesh-bot openshift-service-mesh-bot commented Dec 10, 2025

Generated by Automator - 2025-12-10T18:08:13+00:00

…tem#1421) (istio-ecosystem#1431)

* Add support for pinning tool versions to minor releases

- Add PIN_MINOR flag to only update patch versions while keeping major.minor the same
- Add TOOLS_ONLY flag to skip Istio updates and only update tools
- Remove kube-rbac-proxy update as it's no longer needed

🤖 Generated with [Claude Code](https://claude.com/claude-code)




* Make the linter happy



* Fix regex for getLatestMinorVersion and rename it to make better sense



---------

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
* upstream/release-1.26:
  Add support for pinning tool versions to minor releases (istio-ecosystem#1421) (istio-ecosystem#1431)
@openshift-service-mesh-bot openshift-service-mesh-bot force-pushed the none-release-3.1-merge_upstream_release-1.26-084b82ec branch from f64b65a to cffab84 Compare December 10, 2025 18:10
@openshift-merge-bot openshift-merge-bot bot merged commit f2c047d into openshift-service-mesh:release-3.1 Dec 10, 2025
8 checks passed
unsortedhashsets pushed a commit to unsortedhashsets/sail-operator that referenced this pull request Jan 28, 2026
* Add documentation for version alias

Signed-off-by: Yann Liu <yannliu@redhat.com>

* Highlight version variables

Signed-off-by: Yann Liu <yannliu@redhat.com>

---------

Signed-off-by: Yann Liu <yannliu@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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants