Skip to content

Commit 4ac80bd

Browse files
committed
Added deprecation warning for --network-plugin=cni
Signed-off-by: Pablo Caderno <[email protected]>
1 parent 2823462 commit 4ac80bd

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

cmd/minikube/cmd/start_flags.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,15 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
276276
glog.Errorf("Found deprecated --enable-default-cni flag, setting --cni=bridge")
277277
chosenCNI = "bridge"
278278
}
279+
// networkPlugin cni deprecation warning
280+
chosenNetworkPlugin := viper.GetString(networkPlugin)
281+
if chosenNetworkPlugin == "cni" {
282+
glog.Errorf("Found deprecated --network-plugin=cni flag (new flag: --cni), setting --cni=auto if not already set")
283+
if chosenCNI == "" {
284+
chosenCNI = "auto"
285+
}
286+
chosenNetworkPlugin = ""
287+
}
279288

280289
cc = config.ClusterConfig{
281290
Name: ClusterFlagValue(),
@@ -321,7 +330,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
321330
FeatureGates: viper.GetString(featureGates),
322331
ContainerRuntime: viper.GetString(containerRuntime),
323332
CRISocket: viper.GetString(criSocket),
324-
NetworkPlugin: viper.GetString(networkPlugin),
333+
NetworkPlugin: chosenNetworkPlugin,
325334
ServiceCIDR: viper.GetString(serviceCIDR),
326335
ImageRepository: repository,
327336
ExtraOptions: config.ExtraOptions,

0 commit comments

Comments
 (0)