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

Add support for cilium 1.9 #10695

Merged
merged 3 commits into from
Feb 7, 2021
Merged

Conversation

olemarkus
Copy link
Member

No description provided.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 30, 2021
@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 area/addons area/api approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 30, 2021
@olemarkus
Copy link
Member Author

/retest

@olemarkus olemarkus force-pushed the cilium-1-9 branch 2 times, most recently from 602f4c8 to 886fbae Compare January 30, 2021 21:06
@olemarkus
Copy link
Member Author

/milestone v1.20

@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Feb 5, 2021
NeedsRollingUpdate: "all",
})
}
} else if ver.Minor == 9 {
Copy link
Member

@rifelpet rifelpet Feb 6, 2021

Choose a reason for hiding this comment

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

Previously there was a lone } else {, was this acting as a default cilium version if the api field isn't set? If so, we should probably keep the } else { here so that 1.9 is installed by default.

EDIT: I just noticed the pkg/model/components/cilium.go change above which sets a default value so perhaps my comment doesn't apply.

Copy link
Member Author

Choose a reason for hiding this comment

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

The code expects that the code running prior does the right thing. Added some guards against that not being the case now.

Copy link
Member

Choose a reason for hiding this comment

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

Was just thinking about that error handling.

Comment on lines 222 to 225
dial-timeout:
retry-timeout:
sort-buffer-len-max:
sort-buffer-drain-timeout:
Copy link
Member

Choose a reason for hiding this comment

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

Could you remove the trailing spaces?

Copy link
Member Author

Choose a reason for hiding this comment

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

Seems pointless to me to set empty keys like that. Removed them.

@olemarkus olemarkus force-pushed the cilium-1-9 branch 2 times, most recently from 939dd11 to 44b34eb Compare February 6, 2021 07:02
Ole Markus With and others added 3 commits February 7, 2021 08:00
Apply suggestions from code review

Co-authored-by: Ciprian Hacman <ciprianhacman@gmail.com>
@olemarkus
Copy link
Member Author

/test pull-kops-e2e-cni-cilium

@hakman
Copy link
Member

hakman commented Feb 7, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 7, 2021
@k8s-ci-robot k8s-ci-robot merged commit 0aa9cf1 into kubernetes:master Feb 7, 2021
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. area/addons area/api 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants