[1.30] Move to fatal error for cis-1.23 profile value (rancher#5781)

* Move to fatal error for cis-1.23 profile value Signed-off-by: Derek Nola <[email protected]> * Use single quotes Signed-off-by: Derek Nola <[email protected]> --------- Signed-off-by: Derek Nola <[email protected]>
mgfritch · May 6, 2024 · ebe1d35 · ebe1d35
1 parent 234ebe5
commit ebe1d35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
 }