From b9006648f20e0f1e71f27d464a527d9639932c99 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 19 Jul 2018 15:52:42 +0300 Subject: [PATCH] kubeadm: rename cri-socket-path -> cri-socket Renamed command line option cri-socket-path for 2 reasons: - to be consistent with the rest of kubeadm code reset/init/join/apply subcommands use --cri-socket - name is misleading as CRI socket can be also an url, not just a path --- cmd/kubeadm/app/cmd/config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index 3789392ce3c..9c5fd1f030e 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -514,5 +514,7 @@ func AddImagesCommonConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.I // AddImagesPullFlags adds flags related to the `kubeadm config images pull` command func AddImagesPullFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1alpha3.InitConfiguration) { + flagSet.StringVar(&cfg.NodeRegistration.CRISocket, "cri-socket", cfg.NodeRegistration.CRISocket, "Specify the CRI socket to connect to.") flagSet.StringVar(&cfg.NodeRegistration.CRISocket, "cri-socket-path", cfg.NodeRegistration.CRISocket, "Path to the CRI socket.") + flagSet.MarkDeprecated("cri-socket-path", "Please, use --cri-socket instead") }