@@ -276,6 +276,15 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
276
276
glog .Errorf ("Found deprecated --enable-default-cni flag, setting --cni=bridge" )
277
277
chosenCNI = "bridge"
278
278
}
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
+ }
279
288
280
289
cc = config.ClusterConfig {
281
290
Name : ClusterFlagValue (),
@@ -321,7 +330,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
321
330
FeatureGates : viper .GetString (featureGates ),
322
331
ContainerRuntime : viper .GetString (containerRuntime ),
323
332
CRISocket : viper .GetString (criSocket ),
324
- NetworkPlugin : viper . GetString ( networkPlugin ) ,
333
+ NetworkPlugin : chosenNetworkPlugin ,
325
334
ServiceCIDR : viper .GetString (serviceCIDR ),
326
335
ImageRepository : repository ,
327
336
ExtraOptions : config .ExtraOptions ,
0 commit comments