This repository has been archived by the owner on Dec 7, 2023. It is now read-only.
Remove .spec.network.mode; use a global --network-plugin flag instead
#319
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
luxas
added
the
kind/api-change
luxas
force-pushed
the
instance-specific-networkmode
branch
from
0b76084
to
909d995
Compare
luxas
changed the title
twelho
approved these changes
Aug 12, 2019
|
|
||
| // Convert_v1alpha1_VMNetworkSpec_To_ignite_VMNetworkSpec calls the autogenerated conversion function and possibly custom conversion logic | ||
| func Convert_v1alpha1_VMNetworkSpec_To_ignite_VMNetworkSpec(in *VMNetworkSpec, out *ignite.VMNetworkSpec, s conversion.Scope) error { | ||
| // .Spec.Network.Mode has been removed in v1alpha2. However, we won't persist that information anywhere in the new API, so |
There was a problem hiding this comment.
.Spec.Network.Mode -> .spec.network.mode, the wording on this comment is also a bit funky. Just something like "The network mode is not tracked in the new API, so there's no extra conversion logic" would be enough.
| @@ -174,3 +174,10 @@ func Convert_v1alpha1_VMKernelSpec_To_ignite_VMKernelSpec(in *VMKernelSpec, out | |||
|
|
|||
| return Convert_v1alpha1_OCIClaim_To_ignite_OCI(&in.OCIClaim, &out.OCI) | |||
| } | |||
|
|
|||
| // Convert_v1alpha1_VMNetworkSpec_To_ignite_VMNetworkSpec calls the autogenerated conversion function and possibly custom conversion logic | |||
pkg/network/flag/networkflag.go
Outdated
| } | ||
| } | ||
| if foundPlugin == nil { | ||
| return fmt.Errorf("Invalid network mode %q, must be one of %v", val, plugins) |
pkg/network/flag/networkflag.go
Outdated
| for _, plugin := range plugins { | ||
| if plugin.String() == val { | ||
| foundPlugin = &plugin | ||
| break |
There was a problem hiding this comment.
Perform *nf.value = plugin here and return instead of break?
pkg/network/flag/networkflag.go
Outdated
| return fmt.Errorf("Invalid network mode %q, must be one of %v", val, plugins) | ||
| } | ||
| *nf.value = *foundPlugin | ||
| return nil |
There was a problem hiding this comment.
If there's a return in the loop, you can just return fmt.Errorf("invalid network mode %q, must be one of %v", val, plugins) here
pkg/network/flag/networkflag.go
Outdated
| } | ||
|
|
||
| func (nf *NetworkPluginFlag) Type() string { | ||
| return "network-mode" |
There was a problem hiding this comment.
I would call this plugin, so the flag would be --network-plugin plugin instead of --network-plugin network-mode
pkg/network/flag/networkflag.go
Outdated
| var _ pflag.Value = &NetworkPluginFlag{} | ||
|
|
||
| func NetworkPluginVar(fs *pflag.FlagSet, ptr *network.PluginName) { | ||
| fs.Var(&NetworkPluginFlag{value: ptr}, "network-plugin", fmt.Sprintf("Networking mode to use. Available options are: %v", plugins)) |
pkg/operations/remove.go
Outdated
| networkPlugin := providers.NetworkPlugins[vm.Spec.Network.Mode.String()] | ||
| log.Debugf("Removing the container with ID %q from the %s network", networkPlugin.Name(), containerID) | ||
| return networkPlugin.RemoveContainerNetwork(containerID) | ||
| log.Debugf("Removing the container with ID %q from the %s network", providers.NetworkPlugin.Name(), containerID) |
There was a problem hiding this comment.
%s network -> %q network for consistency
luxas
force-pushed
the
instance-specific-networkmode
branch
from
909d995
to
fb0114d
Compare
twelho
reviewed
Aug 12, 2019
|
|
||
| // Convert_v1alpha1_VMNetworkSpec_To_ignite_VMNetworkSpec calls the autogenerated conversion function and custom conversion logic | ||
| func Convert_v1alpha1_VMNetworkSpec_To_ignite_VMNetworkSpec(in *VMNetworkSpec, out *ignite.VMNetworkSpec, s conversion.Scope) error { | ||
| // .Spec.Network.Mode is not tracked in the v1alpha2 and newer, so there's no extra conversion logic |
There was a problem hiding this comment.
".spec.network.mode is not tracked in v1alpha2 and newer, so there's no extra conversion logic"
There was a problem hiding this comment.
.Spec.Network.Mode is exactly as valid, even more IMO. .spec.network.mode is the JSON path
|
Review comments addressed, merging... |
luxas
changed the title
.spec.network.mode; use a global --network-plugin flag instead
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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: #310
cc @twelho