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

Use the OnDelete updateStrategy for AWS VPC CNI DaemonSet #11590

Merged
merged 1 commit into from
May 25, 2021
Merged

Use the OnDelete updateStrategy for AWS VPC CNI DaemonSet #11590

merged 1 commit into from
May 25, 2021

Conversation

johngmyers
Copy link
Member

@johngmyers johngmyers commented May 24, 2021 •
edited
Loading

Fixes #11589

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 24, 2021
@rifelpet
Copy link
Member

I don't recall, will nodes that have outdated daemonset pods report as needing update in kops rolling-update cluster?

@johngmyers
Copy link
Member Author

@rifelpet not unless something changes in the node's userdata.

@olemarkus
Copy link
Member

You can set UpdateNeeded on the addon manifest in bootstrapchannelbuilder. See how cilium does it.

@johngmyers johngmyers force-pushed the aws-vpc-ondelete branch 2 times, most recently from 19d46a4 to 6ac345e Compare May 25, 2021 03:35
@johngmyers
Copy link
Member Author

/retest

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 25, 2021
@k8s-ci-robot k8s-ci-robot merged commit 0749674 into kubernetes:master May 25, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone May 25, 2021
@johngmyers johngmyers deleted the aws-vpc-ondelete branch May 25, 2021 05:45
@johngmyers johngmyers mentioned this pull request May 25, 2021
Merged
@hakman
Copy link
Member

hakman commented May 25, 2021

@johngmyers I think it should be cherry-picked to 1.20 too.
Also, we may want to make the update strategy configurable. Maybe not everyone wants to roll whole cluster on CNI version updates, which can be done independently of kOps upgrades.

k8s-ci-robot added a commit that referenced this pull request May 25, 2021
@k8s-ci-robot
Merge pull request #11597 from johngmyers/automated-cherry-pick-of-#1…
e28e29f 
…1590-upstream-release-1.21

Automated cherry pick of #11590: Use the OnDelete updateStrategy for AWS VPC CNI DaemonSet
@johngmyers
Copy link
Member Author

@hakman feel free to propose a cherry-pick.

@hakman hakman mentioned this pull request May 25, 2021
Merged
k8s-ci-robot added a commit that referenced this pull request May 29, 2021
@k8s-ci-robot
Merge pull request #11601 from hakman/automated-cherry-pick-of-#11590…
42352b7 
…-upstream-release-1.20

Automated cherry pick of #11590: Use the OnDelete updateStrategy for AWS VPC CNI DaemonSet
@ValeriiVozniuk
Copy link

Any chance to get this backported to 1.19? For now our migration to 1.20 is blocked

@ValeriiVozniuk ValeriiVozniuk mentioned this pull request Jun 18, 2021
Closed
@hakman
Copy link
Member

hakman commented Jun 18, 2021

Any chance to get this backported to 1.19? For now our migration to 1.20 is blocked

At the moment, there is no plan for a new 1.19 release.

@olemarkus
Copy link
Member

But you don't have to upgrade to kops minor version by minor version. So once this is released in 1.20 (I believe we don't have a patch version with this change in it) then you can use kops 1.20 directly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@olemarkus olemarkus olemarkus approved these changes

@KashifSaadat KashifSaadat Awaiting requested review from KashifSaadat

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@olemarkus olemarkus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

When migrating a pre-existing cluster to containerd, the AWS VPC CNI DaemonSet still mounts dockershim
6 participants
@johngmyers @rifelpet @olemarkus @k8s-ci-robot @hakman @ValeriiVozniuk