[release-3.1] OSSM-11244: Do not use default annotations from chart/values.yaml#613
Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:release-3.1from Dec 2, 2025
Conversation
Even if we specify ossm/values.yaml via HELM_VALUES_FILE, helm by design merges annotations specified in chart/values.yaml and ossm/values.yaml. To only keep annotations specified in ossm/values.yaml, it's necessary to overwrite all annotations in chart/values.yaml. This is done when merging upstream changes via ossm/merge_upstream.sh
MaxBab
approved these changes
Dec 2, 2025
openshift-merge-bot
bot
merged commit c935197
into
openshift-service-mesh:release-3.1
9 checks passed
unsortedhashsets
pushed a commit
to unsortedhashsets/sail-operator
that referenced
this pull request
Jan 28, 2026
…ons (openshift-service-mesh#613) * Use gcr.io for Istio images Signed-off-by: Marko Lukša <mluksa@redhat.com> * Add local copy of sample manifests and use them in e2e tests Signed-off-by: Marko Lukša <mluksa@redhat.com> * Use quay.io for images in sample manifests Signed-off-by: Marko Lukša <mluksa@redhat.com> --------- Signed-off-by: Marko Lukša <mluksa@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
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.
Even if we specify ossm/values.yaml via HELM_VALUES_FILE, helm by design merges annotations specified in chart/values.yaml and ossm/values.yaml. To only keep annotations specified in ossm/values.yaml, it's necessary to overwrite all annotations in chart/values.yaml. This is done when merging upstream changes via ossm/merge_upstream.sh