release-1.16 Pick require affinity for typha #1368
Merged
Conversation
This file contains 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
tmjd
requested changes
Jul 1, 2021
There was a problem hiding this comment.
How did you pick these changes? I'm asking because of the addition in core_controller.go Line 457-464.
If you performed the pick by picking #1308 I think instead you should pick the 3 individual commits that were picked as part of #1308 instead of picking #1308.
I didn't see any other changes that were not changes in the original pick but I'm concerned I might have missed something.
freecaykes
force-pushed
the
pick-require-affinity-for-typha-1.16
branch
2 times, most recently
from
759c692
to
12253b4
Compare
* Allow user to select affinity model for Typha * Regenerate autogenerated files * affinity set correct affinity based on config * Set RequiredDuring as a default for AKS, allow RequiredDuring to be selected * Unit test coverage * Revert temporary script change * Fix spelling * Remove protobuf, gen docs * Make AKS RequiredDuringSchedulingIgnoredDuringExecution a default value * Update comments, update typha affinity if clause for clarity * Typo fix
freecaykes
force-pushed
the
pick-require-affinity-for-typha-1.16
branch
from
12253b4
to
eb744dc
Compare
|
/merge-when-ready delete-branch |
|
OK, I will merge the pull request when it's ready, leave the commits as is when I merge it, and delete the branch after I've merged it. |
|
I'm sorry but I failed delete the branch after merging the pull request. |
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
pick from #1308 for release-v1.16
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.