This repository was archived by the owner on Mar 9, 2022. It is now read-only.
Support netd in GCE bootstrap.#869
Merged
Random-Liu merged 1 commit intocontainerd:masterfrom Jul 31, 2018
Merged
Conversation
Member
Author
|
@Random-Liu: GitHub didn't allow me to request PR reviews from the following users: jingax10, cadmuxe. Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs. DetailsIn response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
jingax10
reviewed
Jul 31, 2018
cluster/gce/configure.sh
Outdated
| cni_template_path="" | ||
| if [ "${KUBERNETES_MASTER:-}" != "true" ]; then | ||
| if [ "${NETWORK_POLICY_PROVIDER:-"none"}" != "none" ] || [ "${ENABLE_NETD:-}" == "true" ]; then | ||
| # Use Kubernetes cni daemonset on node if network policy provider is specified. |
There was a problem hiding this comment.
nit: please revise the comment to match updated logic
e.g., if network policy provider is specified or netd is enabled
Signed-off-by: Lantao Liu <lantaol@google.com>
Member
|
/lgtm |
Random-Liu
added a commit
that referenced
this pull request
Jul 31, 2018
Cherrypick #869 into release/1.11
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
We should cherrypick this to 1.11, because netd support is added in Kubernetes 1.11. kubernetes/kubernetes#64591
Signed-off-by: Lantao Liu lantaol@google.com