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.

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

[CIS-1.5] Move profile flag to common flags #387

Merged
merged 1 commit into from
Sep 29, 2020

Conversation

brandond
Copy link
Member

@brandond brandond commented Sep 29, 2020

Proposed Changes

Move profile flag to common flags for server/agent so that it can be loaded from config YAML. Also simplified flag use a bit to get rid of unnecessary iteration over flag lists.

Types of Changes

  • CLI

Verification

  • Start rke2 with profile: cis-1.5in config.yaml
  • Note that user and sysctls are validated; no "Not running in CIS mode" warning shown.

Linked Issues

Related to #351

Further Comments

@brandond brandond requested a review from a team as a code owner September 29, 2020 09:15
pkg/rke2/rke2.go Outdated Show resolved Hide resolved
pkg/cli/cmds/agent.go Outdated Show resolved Hide resolved
@cjellick
Copy link
Contributor

Pinged you about this, but going to post here for transparency:
I'd like this PR to be as minimal as possible to get the profile flag working. Unfortunately between now and GA, we need to be incredibly tactical in every line of code we change.

Move profile flag to common flags for server/agent so that it can be
loaded from config YAML.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond reopened this Sep 29, 2020
@@ -54,8 +54,16 @@ func NewAgentCommand() cli.Command {
}

func AgentRun(clx *cli.Context) error {
if profile == "" {
switch profile {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would probably make sense to have in a function in root.go that takes the profile string as an arg and does this logic so it's not needed to be maintained in 2 different places. More easily extensible too if/when we move to 1.6, etc. Not blocking however it'd be cool to have an issue that captures this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree 100%. I had originally moved this into the validateCISreqs function, but Craig asked me to reduce the amount of change so I went for a more minimal approach at the cost of some repetition.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1. He basically had that, but I asked him to minimize the pr to the smallest change possible for the purpose of reviewing and merging as quickly as possible.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. Do we have an issue for this for after GA?

@brandond brandond merged commit 13d8832 into rancher:master Sep 29, 2020
@brandond brandond changed the title Move profile flag to common flags [CIS-1.5] Move profile flag to common flags Sep 29, 2020
brandond added a commit to brandond/rke2 that referenced this pull request Oct 1, 2020
Stop ranging over CLI flags; the type checks are tedious and
error-prone.

Fixes errors turned up in QA validation of rancher#387.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond added a commit that referenced this pull request Oct 1, 2020
Stop ranging over CLI flags; the type checks are tedious and
error-prone.

Fixes errors turned up in QA validation of #387.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants