From ebe1d35dbd701b6dcfa1a08a27b3877d35a00855 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Mon, 6 May 2024 12:28:58 -0700 Subject: [PATCH] [1.30] Move to fatal error for cis-1.23 profile value (#5781) * Move to fatal error for cis-1.23 profile value Signed-off-by: Derek Nola * Use single quotes Signed-off-by: Derek Nola --------- Signed-off-by: Derek Nola --- pkg/cli/cmds/root.go | 4 ++-- pkg/rke2/rke2.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cli/cmds/root.go b/pkg/cli/cmds/root.go index bef07c1767..d72c4179fe 100644 --- a/pkg/cli/cmds/root.go +++ b/pkg/cli/cmds/root.go @@ -83,8 +83,8 @@ var ( Destination: &config.CloudProviderConfig, }, &cli.StringFlag{ - Name: "profile", - Usage: "(security) Validate system configuration against the selected benchmark (valid items: cis, cis-1.23 (deprecated))", + Name: "profile", + Usage: "(security) Validate system configuration against the selected benchmark (valid items: cis)", EnvVar: "RKE2_CIS_PROFILE", }, &cli.StringFlag{ diff --git a/pkg/rke2/rke2.go b/pkg/rke2/rke2.go index 86cb930371..b84e7d68bb 100644 --- a/pkg/rke2/rke2.go +++ b/pkg/rke2/rke2.go @@ -275,7 +275,7 @@ func removeDisabledPods(dataDir, containerRuntimeEndpoint string, disabledItems func isCISMode(clx *cli.Context) bool { profile := clx.String("profile") if profile == CISProfile123 { - logrus.Warn("cis-1.23 profile is deprecated and will be removed in v1.29. Please use cis instead.") + logrus.Fatal("cis-1.23 profile is deprecated. Please use 'cis' instead.") } return profile == CISProfile123 || profile == CISProfile }