Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release-1.25] Support generic "cis" profile #4799

Merged
merged 2 commits into from
Sep 26, 2023
+7 −3
Merged

[Release-1.25] Support generic "cis" profile #4799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d2139c
Support generic "cis" profile (#4708)
dereknola Sep 6, 2023
c38a343
gofmt
dereknola Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cli/cmds/profile_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func setCISFlags(clx *cli.Context) error {

func validateProfile(clx *cli.Context, role CLIRole) {
switch clx.String("profile") {
case rke2.CISProfile123:
case rke2.CISProfile123, rke2.CISProfile:
if err := validateCISReqs(role); err != nil {
logrus.Fatal(err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/cmds/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var (
},
&cli.StringFlag{
Name: "profile",
Usage: "(security) Validate system configuration against the selected benchmark (valid items: " + rke2.CISProfile123 + " )",
Usage: "(security) Validate system configuration against the selected benchmark (valid items: cis, cis-1.23 (deprecated))",
EnvVar: "RKE2_CIS_PROFILE",
},
&cli.StringFlag{
Expand Down
6 changes: 5 additions & 1 deletion pkg/rke2/rke2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ type ExtraEnv struct {
// Valid CIS Profile versions
const (
CISProfile123 = "cis-1.23"
CISProfile = "cis"
defaultAuditPolicyFile = "/etc/rancher/rke2/audit-policy.yaml"
containerdSock = "/run/k3s/containerd/containerd.sock"
KubeAPIServer = "kube-apiserver"
Expand Down Expand Up @@ -275,7 +276,10 @@ func removeDisabledPods(dataDir, containerRuntimeEndpoint string, disabledItems

func isCISMode(clx *cli.Context) bool {
profile := clx.String("profile")
return profile == CISProfile123
if profile == CISProfile123 {
logrus.Warn("cis-1.23 profile is deprecated and will be removed in v1.29. Please use cis instead.")
}
return profile == CISProfile123 || profile == CISProfile
}

// TODO: move this into the podexecutor package, this logic is specific to that executor and should be there instead of here.
Expand Down