Apply our customizations on top of upstream release-2.4 #595
Conversation
…partition (like gov cloud or china AWS partition) (#588) * create-aws-client-with-region
* give name to secondary subnets * make linter happy
…he lifecycle policy (#593) * Delete machine pool user data files that did not get deleted yet by the lifecycle policy * Use paging for S3 results * Log S3 list operation * Handle NotFound
fiunchinho
changed the title
| ### Build the images locally | ||
| ```sh | ||
| git fetch upstream | ||
| git diff `# the upstream tag we merged recently` vX.Y.Z..origin/release-X.Y `# our release branch` -- ':!.circleci/' "!.github/workflows/release.yml' ':!README.md' |
There was a problem hiding this comment.
My earlier mistake in quoting, let's fix this so the command really works
| git diff `# the upstream tag we merged recently` vX.Y.Z..origin/release-X.Y `# our release branch` -- ':!.circleci/' "!.github/workflows/release.yml' ':!README.md' | |
| git diff `# the upstream tag we merged recently` vX.Y.Z..origin/release-X.Y `# our release branch` -- ':!.circleci/' '!.github/workflows/release.yml' ':!README.md' |
|
Regarding the "Small fixes" commit – can you try to cherry-pick #596 since then that one unit test doesn't need to be removed? That PR also adds Also, please check if kubernetes-sigs#4698 was really merged, since it's not in |
I'll remove my last commit and cherry pick your PR.
I think it is kubernetes-sigs#4698 |
…king until previous one is finished (which may have led to failing nodes due to outdated join token) (#598)
fiunchinho
force-pushed
the
upgrade-release-2-4
branch
from
0352056 to
88714cc
Compare
Towards giantswarm/roadmap#3170