Skip to content

[Backport release-1.6] fix(telemetry): make the documented opt-out cover both collectors - #3916

Merged
myasnikovdaniil merged 1 commit into
release-1.6from
backport-3791-to-release-1.6
Sep 3, 2026
Merged

myasnikovdaniil merged 1 commit into
release-1.6from
backport-3791-to-release-1.6

Conversation

@github-actions

Copy link
Copy Markdown

Description

Backport of #3791 to release-1.6.

@github-actions

Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-3791-to-release-1.6
git worktree add --checkout .worktree/backport-3791-to-release-1.6 backport-3791-to-release-1.6
cd .worktree/backport-3791-to-release-1.6
git reset --hard HEAD^
git cherry-pick -x c3cead8f6455ea9d98804ed6902c260f6c25c744
git push --force-with-lease

@kvaps
Andrei Kvapil (kvaps) force-pushed the backport-3791-to-release-1.6 branch from c78ae09 to 54115cf Compare August 20, 2026 12:27
@github-actions github-actions Bot added size/L This PR changes 100-499 lines, ignoring generated files area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug labels Aug 20, 2026
@myasnikovdaniil
myasnikovdaniil marked this pull request as ready for review September 3, 2026 05:38
@myasnikovdaniil
myasnikovdaniil force-pushed the backport-3791-to-release-1.6 branch from 54115cf to b7a6acc Compare September 3, 2026 07:04
Backport of #3791 to release-1.6.

The automated backport stopped on a conflict in
packages/core/installer/values.yaml and committed the markers: the branch
pins the operator at v1.6.2 while the change carried main's v1.6.0 pin
alongside the new key. Resolved by keeping this branch's image and taking
only the new disableTelemetry key with its comment, which is what the
backport was for.

Signed-off-by: Andrei Kvapil <[email protected]>
Signed-off-by: Myasnikov Daniil <[email protected]>
@myasnikovdaniil
myasnikovdaniil force-pushed the backport-3791-to-release-1.6 branch from b7a6acc to 3bc66c7 Compare September 3, 2026 07:05
@myasnikovdaniil
myasnikovdaniil merged commit eeb8d63 into release-1.6 Sep 3, 2026
12 of 13 checks passed
@myasnikovdaniil
myasnikovdaniil deleted the backport-3791-to-release-1.6 branch September 3, 2026 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug size/L This PR changes 100-499 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants