From 5dac4ee1695740a4f437ad16bb6d77656d9c3021 Mon Sep 17 00:00:00 2001 From: carlory Date: Mon, 15 Sep 2025 09:56:13 +0800 Subject: [PATCH] Improve dry-run error messages for clarity --- cmd/kubeadm/app/cmd/init.go | 2 +- cmd/kubeadm/app/cmd/join.go | 2 +- cmd/kubeadm/app/cmd/upgrade/apply.go | 2 +- cmd/kubeadm/app/cmd/upgrade/node.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 8afca7b4267..7927c0f0195 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -355,7 +355,7 @@ func newInitData(cmd *cobra.Command, args []string, initOptions *initOptions, ou dryRunDir := "" if initOptions.dryRun || cfg.DryRun { if dryRunDir, err = kubeadmconstants.GetDryRunDir(kubeadmconstants.EnvVarInitDryRunDir, "kubeadm-init-dryrun", klog.Warningf); err != nil { - return nil, errors.Wrap(err, "could not create a temporary directory") + return nil, errors.Wrap(err, "could not create a temporary directory on dryrun") } } diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index da943424ceb..1762fc98284 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -467,7 +467,7 @@ func newJoinData(cmd *cobra.Command, args []string, opt *joinOptions, out io.Wri dryRunDir := "" if opt.dryRun || cfg.DryRun { if dryRunDir, err = kubeadmconstants.GetDryRunDir(kubeadmconstants.EnvVarJoinDryRunDir, "kubeadm-join-dryrun", klog.Warningf); err != nil { - return nil, errors.Wrap(err, "could not create a temporary directory") + return nil, errors.Wrap(err, "could not create a temporary directory on dryrun") } } diff --git a/cmd/kubeadm/app/cmd/upgrade/apply.go b/cmd/kubeadm/app/cmd/upgrade/apply.go index 2ed6d9c0bd8..0897d20a452 100644 --- a/cmd/kubeadm/app/cmd/upgrade/apply.go +++ b/cmd/kubeadm/app/cmd/upgrade/apply.go @@ -200,7 +200,7 @@ func newApplyData(cmd *cobra.Command, args []string, applyFlags *applyFlags) (*a dryRunDir := "" if *dryRun { if dryRunDir, err = constants.GetDryRunDir(constants.EnvVarUpgradeDryRunDir, "kubeadm-upgrade-apply-dryrun", klog.Warningf); err != nil { - return nil, errors.Wrap(err, "could not create a temporary directory") + return nil, errors.Wrap(err, "could not create a temporary directory on dryrun") } } diff --git a/cmd/kubeadm/app/cmd/upgrade/node.go b/cmd/kubeadm/app/cmd/upgrade/node.go index 73bbe79feb2..97f2fb7e7d2 100644 --- a/cmd/kubeadm/app/cmd/upgrade/node.go +++ b/cmd/kubeadm/app/cmd/upgrade/node.go @@ -196,7 +196,7 @@ func newNodeData(cmd *cobra.Command, nodeOptions *nodeOptions, out io.Writer) (* dryRunDir := "" if *dryRun { if dryRunDir, err = constants.GetDryRunDir(constants.EnvVarUpgradeDryRunDir, "kubeadm-upgrade-node-dryrun", klog.Warningf); err != nil { - return nil, errors.Wrap(err, "couldn't create a temporary directory") + return nil, errors.Wrap(err, "couldn't create a temporary directory on dryrun") } }