From 37af5f5f50821a94f328e2c81d54db093a9fd539 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Wed, 12 Jul 2023 11:53:00 +0200 Subject: [PATCH] cli: allow upgrade to succeed if desired attestation config == actual config (#2094) --- cli/internal/cmd/upgradeapply.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cli/internal/cmd/upgradeapply.go b/cli/internal/cmd/upgradeapply.go index 415a4e2d9..7451480d3 100644 --- a/cli/internal/cmd/upgradeapply.go +++ b/cli/internal/cmd/upgradeapply.go @@ -345,9 +345,13 @@ func (u *upgradeApplyCmd) upgradeAttestConfigIfDiff(cmd *cobra.Command, newConfi return fmt.Errorf("getting cluster attestation config: %w", err) } // If the current config is equal, or there is an error when comparing the configs, we skip the upgrade. - if equal, err := newConfig.EqualTo(clusterAttestationConfig); err != nil || equal { + equal, err := newConfig.EqualTo(clusterAttestationConfig) + if err != nil { return fmt.Errorf("comparing attestation configs: %w", err) } + if equal { + return nil + } if !flags.yes { ok, err := askToConfirm(cmd, "You are about to change your cluster's attestation config. Are you sure you want to continue?")