Make sure a correct helm values file is used by FilipB · Pull Request #1297 · istio-ecosystem/sail-operator

FilipB · 2025-10-22T06:48:48Z

It's possible to define a helm values file via HELM_VALUES_FILE env variable so we have to obey that when patching the file. We also need an option to disable the patching for ossm.

codecov · 2025-10-22T06:52:51Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 77.91%. Comparing base (38ddb8a) to head (dd07339).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1297      +/-   ##
==========================================
+ Coverage   77.69%   77.91%   +0.21%     
==========================================
  Files          44       44              
  Lines        2834     2834              
==========================================
+ Hits         2202     2208       +6     
+ Misses        524      520       -4     
+ Partials      108      106       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

This is required after istio-ecosystem#1297

dgn · 2025-10-22T14:56:38Z

Have you tested this against the nightly build? I'm not sure but I think that's where the --version flag originated

It's possible to define a helm values file via HELM_VALUES_FILE env variable so we have to obey that when patching the file. We also need an option to disable the patching for ossm. Signed-off-by: Filip Brychta <fbrychta@redhat.com>

FilipB · 2025-10-23T06:27:39Z

Have you tested this against the nightly build? I'm not sure but I think that's where the --version flag originated

Thank you, I missed that. It's there really because of nightly builds. I put it back + added a comment

Signed-off-by: Filip Brychta <fbrychta@redhat.com>

istio-testing · 2025-10-23T08:25:40Z

In response to a cherrypick label: #1297 failed to apply on top of branch "release-1.0":

Applying: Make sure a correct helm values file is used
Using index info to reconstruct a base tree...
M	Makefile.core.mk
Falling back to patching base and 3-way merge...
Auto-merging Makefile.core.mk
CONFLICT (content): Merge conflict in Makefile.core.mk
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Make sure a correct helm values file is used

istio-testing · 2025-10-23T08:25:41Z

In response to a cherrypick label: new issue created for failed cherrypick: #1304

istio-testing · 2025-10-23T08:26:17Z

In response to a cherrypick label: new pull request created: #1305

istio-testing · 2025-10-23T08:26:54Z

In response to a cherrypick label: new pull request created: #1306

This is required after istio-ecosystem#1297

* upstream/main: (40 commits) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1324) Prevent pruning IstioRevisions with unknown InUse status (istio-ecosystem#1322) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1323) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1321) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1320) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1318) Increase e2e timeout when waiting for service LB (istio-ecosystem#1314) docs: IstioCNI: mention resource name restriction (istio-ecosystem#1288) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1313) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1311) Update Ztunnel config CRD flags (istio-ecosystem#1117) Fix ZTunnel name field in UI (istio-ecosystem#1284) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1308) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1307) fix: add v1.26.1 version (istio-ecosystem#1301) Make sure a correct helm values file is used (istio-ecosystem#1297) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1303) Small change in the migration from sidecar to ambient doc (istio-ecosystem#1300) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1296) Updating migration from sidecar to Ambient mode from review (istio-ecosystem#1294) ...

* upstream/main: (41 commits) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1325) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1324) Prevent pruning IstioRevisions with unknown InUse status (istio-ecosystem#1322) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1323) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1321) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1320) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1318) Increase e2e timeout when waiting for service LB (istio-ecosystem#1314) docs: IstioCNI: mention resource name restriction (istio-ecosystem#1288) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1313) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1311) Update Ztunnel config CRD flags (istio-ecosystem#1117) Fix ZTunnel name field in UI (istio-ecosystem#1284) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1308) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1307) fix: add v1.26.1 version (istio-ecosystem#1301) Make sure a correct helm values file is used (istio-ecosystem#1297) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1303) Small change in the migration from sidecar to ambient doc (istio-ecosystem#1300) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1296) ...

* upstream/main: (42 commits) Update sleep kustomization file (istio-ecosystem#1327) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1325) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1324) Prevent pruning IstioRevisions with unknown InUse status (istio-ecosystem#1322) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1323) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1321) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1320) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1318) Increase e2e timeout when waiting for service LB (istio-ecosystem#1314) docs: IstioCNI: mention resource name restriction (istio-ecosystem#1288) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1313) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1311) Update Ztunnel config CRD flags (istio-ecosystem#1117) Fix ZTunnel name field in UI (istio-ecosystem#1284) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1308) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1307) fix: add v1.26.1 version (istio-ecosystem#1301) Make sure a correct helm values file is used (istio-ecosystem#1297) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1303) Small change in the migration from sidecar to ambient doc (istio-ecosystem#1300) ...

* upstream/main: (43 commits) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1332) Update sleep kustomization file (istio-ecosystem#1327) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1325) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1324) Prevent pruning IstioRevisions with unknown InUse status (istio-ecosystem#1322) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1323) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1321) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1320) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1318) Increase e2e timeout when waiting for service LB (istio-ecosystem#1314) docs: IstioCNI: mention resource name restriction (istio-ecosystem#1288) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1313) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1311) Update Ztunnel config CRD flags (istio-ecosystem#1117) Fix ZTunnel name field in UI (istio-ecosystem#1284) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1308) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1307) fix: add v1.26.1 version (istio-ecosystem#1301) Make sure a correct helm values file is used (istio-ecosystem#1297) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1303) ...

* Make sure a correct helm values file is used It's possible to define a helm values file via HELM_VALUES_FILE env variable so we have to obey that when patching the file. We also need an option to disable the patching for ossm. Signed-off-by: Filip Brychta <fbrychta@redhat.com> * Explaining why we are overwriting the version Signed-off-by: Filip Brychta <fbrychta@redhat.com> --------- Signed-off-by: Filip Brychta <fbrychta@redhat.com> Signed-off-by: Rafael Zago <rafaelvzago@gmail.com>

* Make sure a correct helm values file is used It's possible to define a helm values file via HELM_VALUES_FILE env variable so we have to obey that when patching the file. We also need an option to disable the patching for ossm. Signed-off-by: Filip Brychta <fbrychta@redhat.com> * Explaining why we are overwriting the version Signed-off-by: Filip Brychta <fbrychta@redhat.com> --------- Signed-off-by: Filip Brychta <fbrychta@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com>

FilipB requested a review from a team as a code owner October 22, 2025 06:48

istio-testing added the size/S label Oct 22, 2025

FilipB added a commit to FilipB/sail-operator that referenced this pull request Oct 22, 2025

Do not patch the values and do not generate digests

10a8b12

This is required after istio-ecosystem#1297

FilipB mentioned this pull request Oct 22, 2025

Do not patch the values and do not generate digests openshift-service-mesh/sail-operator#568

Merged

FilipB added a commit to FilipB/sail-operator that referenced this pull request Oct 22, 2025

Do not patch the helm values

3ebc433

This is required after istio-ecosystem#1297

FilipB mentioned this pull request Oct 22, 2025

Do not patch the helm values openshift-service-mesh/sail-operator#569

Merged

FilipB added cherrypick/release-1.0 cherrypick/release-1.27 cherrypick/release-1.26 labels Oct 22, 2025

Make sure a correct helm values file is used

670a2d5

It's possible to define a helm values file via HELM_VALUES_FILE env variable so we have to obey that when patching the file. We also need an option to disable the patching for ossm. Signed-off-by: Filip Brychta <fbrychta@redhat.com>

FilipB force-pushed the fix-helm-values-file branch from f21bd01 to 670a2d5 Compare October 23, 2025 06:26

istio-testing added size/XS and removed size/S labels Oct 23, 2025

Explaining why we are overwriting the version

dd07339

Signed-off-by: Filip Brychta <fbrychta@redhat.com>

istio-testing added size/S and removed size/XS labels Oct 23, 2025

dgn approved these changes Oct 23, 2025

View reviewed changes

istio-testing merged commit 0427a05 into istio-ecosystem:main Oct 23, 2025
16 of 17 checks passed

istio-testing mentioned this pull request Oct 23, 2025

[release-1.0] Make sure a correct helm values file is used #1304

Closed

istio-testing mentioned this pull request Oct 23, 2025

[release-1.26] Make sure a correct helm values file is used #1305

Merged

istio-testing mentioned this pull request Oct 23, 2025

[release-1.27] Make sure a correct helm values file is used #1306

Merged

FilipB removed the cherrypick/release-1.0 label Oct 23, 2025

openshift-merge-bot bot pushed a commit to openshift-service-mesh/sail-operator that referenced this pull request Oct 23, 2025

Do not patch the values and do not generate digests (#568)

c943b53

This is required after istio-ecosystem#1297

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make sure a correct helm values file is used#1297

Make sure a correct helm values file is used#1297
istio-testing merged 2 commits intoistio-ecosystem:mainfrom
FilipB:fix-helm-values-file

FilipB commented Oct 22, 2025 •

edited

Loading

Uh oh!

codecov bot commented Oct 22, 2025 •

edited

Loading

Uh oh!

dgn commented Oct 22, 2025

Uh oh!

FilipB commented Oct 23, 2025 •

edited

Loading

Uh oh!

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

FilipB commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dgn commented Oct 22, 2025

Uh oh!

FilipB commented Oct 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

istio-testing commented Oct 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

FilipB commented Oct 22, 2025 •

edited

Loading

codecov bot commented Oct 22, 2025 •

edited

Loading

FilipB commented Oct 23, 2025 •

edited

Loading