From 3037ff8f120069ab55f7528fff0a21a6e822bb48 Mon Sep 17 00:00:00 2001 From: den-rgb Date: Mon, 27 May 2024 14:43:58 +0100 Subject: [PATCH] OCM-8283 | fix: kubelet-config edit prompt no longer shows up when kubelet-configs are not targeted --- cmd/edit/machinepool/nodepool.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/edit/machinepool/nodepool.go b/cmd/edit/machinepool/nodepool.go index 2ab402939a..e33a025f62 100644 --- a/cmd/edit/machinepool/nodepool.go +++ b/cmd/edit/machinepool/nodepool.go @@ -176,7 +176,7 @@ func editNodePool(cmd *cobra.Command, nodePoolID string, inputKubeletConfig = nodePool.KubeletConfigs() } - // Skip if no tuning configs are available + // Skip if no kubelet configs are available if len(availableKubeletConfigs) > 0 { inputKubeletConfig, err = interactive.GetMultipleOptions(interactive.Input{ Question: "Kubelet config", @@ -199,6 +199,7 @@ func editNodePool(cmd *cobra.Command, nodePoolID string, os.Exit(1) } npBuilder.KubeletConfigs(inputKubeletConfig...) + isKubeletConfigSet = true } if isNodeDrainGracePeriodSet || interactive.Enabled() { @@ -234,7 +235,7 @@ func editNodePool(cmd *cobra.Command, nodePoolID string, return fmt.Errorf("Failed to create machine pool for hosted cluster '%s': %v", clusterKey, err) } - if !promptForNodePoolNodeRecreate(nodePool, update, PromptToAcceptNodePoolNodeRecreate, r) { + if isKubeletConfigSet && !promptForNodePoolNodeRecreate(nodePool, update, PromptToAcceptNodePoolNodeRecreate, r) { return nil }