Automatically apply CNI on multinode clusters #7930
Merged
Conversation
This file contains 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
k8s-ci-robot
added
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sharifelgamal 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 |
k8s-ci-robot
added
the
approved
k8s-ci-robot
added
size/L
medyagh
reviewed
Apr 28, 2020
| @@ -811,6 +811,7 @@ func kubectlPath(cfg config.ClusterConfig) string { | |||
|
|
|||
| // applyKICOverlay applies the CNI plugin needed to make kic work | |||
| func (k *Bootstrapper) applyKICOverlay(cfg config.ClusterConfig) error { | |||
| fmt.Println("APPLY KIC OVERLAY") | |||
medyagh
reviewed
Apr 28, 2020
pkg/minikube/driver/driver.go
Outdated
| @@ -163,9 +162,9 @@ func FlagDefaults(name string) FlagHints { | |||
| fh := FlagHints{} | |||
| if name != None { | |||
| fh.CacheImages = true | |||
| // only for kic, till other run-times are available we auto-set containerd. | |||
| // only for kic, until other runtimes are available we auto-set containerd. | |||
There was a problem hiding this comment.
this comment actually is no long true, we have other run-time,s we can just delete this comment.
medyagh
reviewed
Apr 28, 2020
pkg/minikube/config/config.go
Outdated
| return nil | ||
| } | ||
|
|
||
| // MultiNode returns true if the cluster |
medyagh
reviewed
Apr 28, 2020
pkg/minikube/config/config.go
Outdated
| // MultiNodeCNIConfig add default CNI config needed for multinode clusters and saves off the config | ||
| func MultiNodeCNIConfig(cc *ClusterConfig) error { | ||
| if cc.KubernetesConfig.ExtraOptions.Get("pod-network-cidr", "kubeadm") == "" { | ||
| fmt.Println("SETTING CNI CONFIG") |
medyagh
reviewed
Apr 28, 2020
k8s-ci-robot
added
size/M
|
/ok-to-test |
k8s-ci-robot
added
the
ok-to-test
|
kvm2 Driver |
tstromberg
approved these changes
Apr 29, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #7459