config.go (kubernetes-1.18.14) | : | config.go (kubernetes-1.18.15) | ||
---|---|---|---|---|
skipping to change at line 567 | skipping to change at line 567 | |||
return imagesList.Run(out, printer) | return imagesList.Run(out, printer) | |||
}, | }, | |||
} | } | |||
outputFlags.AddFlags(cmd) | outputFlags.AddFlags(cmd) | |||
AddImagesCommonConfigFlags(cmd.PersistentFlags(), externalcfg, &cfgPath, &featureGatesString) | AddImagesCommonConfigFlags(cmd.PersistentFlags(), externalcfg, &cfgPath, &featureGatesString) | |||
return cmd | return cmd | |||
} | } | |||
// NewImagesList returns the underlying struct for the "kubeadm config images li st" command | // NewImagesList returns the underlying struct for the "kubeadm config images li st" command | |||
func NewImagesList(cfgPath string, cfg *kubeadmapiv1beta2.ClusterConfiguration) (*ImagesList, error) { | func NewImagesList(cfgPath string, cfg *kubeadmapiv1beta2.ClusterConfiguration) (*ImagesList, error) { | |||
// Avoid running the CRI auto-detection code as we don't need it | initcfg, err := configutil.LoadOrDefaultInitConfiguration(cfgPath, cmduti | |||
versionedInitCfg := &kubeadmapiv1beta2.InitConfiguration{ | l.DefaultInitConfiguration(), cfg) | |||
NodeRegistration: kubeadmapiv1beta2.NodeRegistrationOptions{ | ||||
CRISocket: constants.DefaultDockerCRISocket, | ||||
}, | ||||
} | ||||
initcfg, err := configutil.LoadOrDefaultInitConfiguration(cfgPath, versio | ||||
nedInitCfg, cfg) | ||||
if err != nil { | if err != nil { | |||
return nil, errors.Wrap(err, "could not convert cfg to an interna l cfg") | return nil, errors.Wrap(err, "could not convert cfg to an interna l cfg") | |||
} | } | |||
return &ImagesList{ | return &ImagesList{ | |||
cfg: initcfg, | cfg: initcfg, | |||
}, nil | }, nil | |||
} | } | |||
// ImagesList defines the struct used for "kubeadm config images list" | // ImagesList defines the struct used for "kubeadm config images list" | |||
End of changes. 1 change blocks. | ||||
9 lines changed or deleted | 2 lines changed or added |