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.

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

Upgrde amazon vpc cni to 1.6.2 #9214

Merged
merged 1 commit into from
Jun 1, 2020

Conversation

moshevayner
Copy link
Member

Two changes in this PR:

  1. Upgrading image to version 1.6.2 following release
  2. Applying changes to node selectors, following this update to the upstream manifest

@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 30, 2020
@@ -3926,15 +3926,15 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "beta.kubernetes.io/os"
- key: "kubernetes.io/os"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to do this just yet as we are only just removing support for k8s 1.9 as of the 1.18 release, and these stable labels were only added as of k8s 1.14.

Looks like we'll need to fix it and all the other uses through the codebase of the beta labels before 1.19 though: kubernetes/kubernetes#91046

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gjtempleton This change is applied only to the 1.16+ template, so should be ok.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I’m not planning to backport it to earlier versions since it doesn’t seem to contain any critical fixes, just slight improvements. So if we merge it today it’ll probably go to 1.18 which should be fine.

@moshevayner
Copy link
Member Author

/assign @geojaz

@hakman
Copy link
Member

hakman commented Jun 1, 2020

/lgtm
/assign @rifelpet

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 1, 2020
@rifelpet
Copy link
Member

rifelpet commented Jun 1, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MoShitrit, rifelpet

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2020
@k8s-ci-robot k8s-ci-robot merged commit 1f93f9e into kubernetes:master Jun 1, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jun 1, 2020
@moshevayner moshevayner deleted the update-aws-cni-1.6.2 branch June 1, 2020 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants