(pick) Istio features for release-v1.40 #4289
Merged
Conversation
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
- plus small fix on clean up chart files
The resource PodDisruptionBudget "istiod" is not being created by Istio helm charts anymore
Manual fixes for cherry-pick: - Revert go.mod to Go 1.24.9 (api/go.mod to Go 1.23.5) - Remove 'variant' field from Istio components (not present in v1.40 Component struct)
rene-dekker
approved these changes
Dec 9, 2025
caseydavenport
requested changes
Dec 9, 2025
Member
caseydavenport
left a comment
caseydavenport
left a comment
There was a problem hiding this comment.
We need to disable the Istio controller for OSS installs in this branch, as it's an active release branch for a version of Calico that doesn't include the Istio integration code.
Pick istio to v1.40
Downgrade tigera/api version
caseydavenport
approved these changes
Dec 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Cherry-picks Istio features from master to release-v1.40.
Includes:
Release Note
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.