Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(meshtimeout): don't set default timeouts on inbound cluster and listener (backport of #12043) #12047

Closed
wants to merge 1 commit into from
Closed

fix(meshtimeout): don't set default timeouts on inbound cluster and listener (backport of #12043) #12047

wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Nov 14, 2024

Automatic cherry-pick of #12043 for branch release-2.6

Generated by action

cherry-picked commit 844c988
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit 844c9881c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   pkg/plugins/policies/meshtimeout/plugin/testdata/basic_without_defaults_inbound_cluster.golden.yaml
	new file:   pkg/plugins/policies/meshtimeout/plugin/testdata/basic_without_defaults_inbound_listener.golden.yaml
	modified:   pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/plugins/policies/meshtimeout/plugin/v1alpha1/plugin.go

@lukidzi @kumahq
fix(meshtimeout): don't set default timeouts on inbound cluster and l…
98e422e 
…istener (#12043)

We noticed that when a user upgrades to version 2.9.x without a default
MeshTimeout/Timeout policy, default timeouts are applied on inbound
clusters and listeners. This could disrupt the existing behavior of the
environment.

When no policy is present, we simply skip configuration and do not set
up the timeouts for inbound cluster or listener.

Fix #12033

<!--
> Changelog: skip
-->
<!--
Uncomment the above section to explicitly set a [`> Changelog:` entry
here](https://github.com/kumahq/kuma/blob/master/CONTRIBUTING.md#submitting-a-patch)?
-->

---------

Signed-off-by: Lukasz Dziedziak <[email protected]>
@kumahq kumahq bot added the conflict label Nov 14, 2024
@kumahq kumahq bot requested a review from a team as a code owner November 14, 2024 16:57
@kumahq kumahq bot added the release-2.6 label Nov 14, 2024
@kumahq kumahq bot requested review from lobkovilya and Icarus9913 and removed request for a team November 14, 2024 16:57
@lukidzi
Copy link
Contributor

lukidzi commented Nov 14, 2024

Not required, introduced in 2.9

@lukidzi lukidzi closed this Nov 14, 2024
@bartsmykla bartsmykla deleted the chore/backport-release-2.6-12043 branch December 11, 2024 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lobkovilya lobkovilya Awaiting requested review from lobkovilya lobkovilya is a code owner automatically assigned from kumahq/kuma-maintainers

@Icarus9913 Icarus9913 Awaiting requested review from Icarus9913 Icarus9913 is a code owner automatically assigned from kumahq/kuma-maintainers

Assignees
No one assigned
Labels
conflict release-2.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@lukidzi