🐛 Fixes default control, worker machine counts overriding user specified values #2597

gab-satchi · 2020-03-09T17:33:21Z

What this PR does / why we need it:
Replica counts set by the user through ENV vars or config file isn't being used as the flag options take precedence. The flags for control and worker counts default to 1 and 0 respectively and were overriding any values set as ENV vars.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2560

k8s-ci-robot · 2020-03-09T17:33:30Z

Hi @gab-satchi. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nader-ziada · 2020-03-09T17:39:29Z

/ok-to-test

vincepri · 2020-03-09T17:40:16Z

/assign @fabriziopandini

CecileRobertMichon · 2020-03-09T18:22:52Z

cmd/clusterctl/client/config.go

@@ -305,13 +305,19 @@ func (c *clusterctlClient) templateOptionsToVariables(options GetClusterTemplate
 	if options.ControlPlaneMachineCount < 1 {
 		return errors.Errorf("invalid ControlPlaneMachineCount. Please use a number greater or equal than 1")
 	}
-	c.configClient.Variables().Set("CONTROL_PLANE_MACHINE_COUNT", strconv.Itoa(options.ControlPlaneMachineCount))
+	// set CONTROL_PLANE_MACHINE_COUNT if it isn't set already
+	if _, err := c.configClient.Variables().Get("CONTROL_PLANE_MACHINE_COUNT"); err != nil {


shouldn't this be checking options.ControlPlaneMachineCount like above for KubernetesVersion?

do you mean checking that it isn't empty like we do for KubernetesVersion? The options.ControlPlaneMachineCount defaults to 1 so it will always be set.

fabriziopandini

@gab-satchi
IMO having defaults for the CONTROL_PLANE_MACHINE_COUNT and for the WORKER_MACHINE_COUNT makes a nice UX because it does not force the user to pass values.

Also, as a general rule, flags should always have precedence on env variables/variables on the config file.
and thus I don't think that we should go for the proposed implementation that reverts this logic only for the two flags.

So my suggestion is to fix the issue is to:
1 turn the options.ControlPlaneMachineCount and options.WorkerMachineCount to pointers
2 set options.ControlPlaneMachineCount and options.WorkerMachineCount only if the flags are actually set
3 to consider env variables/variables on the config file only if the option fields are nil.

gab-satchi · 2020-03-10T13:59:10Z

/hold

vincepri · 2020-03-10T14:08:52Z

/milestone v0.3.x

gab-satchi · 2020-03-10T18:54:32Z

/hold cancel

fabriziopandini

@gab-satchi thanks for addressing all the comments!
one last nit and then lgtm for me

cmd/clusterctl/client/config.go

fabriziopandini · 2020-03-12T13:58:07Z

Looks great @gab-satchi, thanks!
/lgtm

fabriziopandini · 2020-03-12T13:58:35Z

@vincepri over to you for a final pass

cmd/clusterctl/client/config.go

gab-satchi · 2020-03-16T22:10:58Z

/test pull-cluster-api-verify

vincepri · 2020-03-16T22:12:41Z

/approve
/assign @fabriziopandini
/milestone v0.3.1

k8s-ci-robot · 2020-03-16T22:12:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gab-satchi, vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~cmd/clusterctl/OWNERS~~ [vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vincepri · 2020-03-16T22:34:23Z

/milestone v0.3.x

vincepri · 2020-03-30T16:21:48Z

@fabriziopandini over to your for final lgtm

/milestone v0.3.4

wfernandes · 2020-04-03T21:21:01Z

Reviewing...
/assign

…d values - machine count values assigned in the order: defaults, env vars, flags

wfernandes · 2020-04-03T21:47:11Z

/lgtm

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 9, 2020

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 9, 2020

k8s-ci-robot requested review from fabriziopandini and vincepri March 9, 2020 17:34

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 9, 2020

k8s-ci-robot assigned fabriziopandini Mar 9, 2020

CecileRobertMichon reviewed Mar 9, 2020

View reviewed changes

fabriziopandini reviewed Mar 9, 2020

View reviewed changes

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 10, 2020

k8s-ci-robot added this to the v0.3.x milestone Mar 10, 2020

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 10, 2020

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 10, 2020

gab-satchi force-pushed the 2560-replica-count branch from 240754f to 1da6713 Compare March 10, 2020 19:09

fabriziopandini reviewed Mar 11, 2020

View reviewed changes

cmd/clusterctl/client/config.go Show resolved Hide resolved

gab-satchi requested a review from fabriziopandini March 12, 2020 13:56

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2020

vincepri reviewed Mar 12, 2020

View reviewed changes

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2020

gab-satchi force-pushed the 2560-replica-count branch from 0e1ae44 to ded89fc Compare March 12, 2020 18:50

k8s-ci-robot modified the milestones: v0.3.x, v0.3.1 Mar 16, 2020

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 16, 2020

k8s-ci-robot modified the milestones: v0.3.1, v0.3.x Mar 16, 2020

k8s-ci-robot modified the milestones: v0.3.x, v0.3.4 Mar 30, 2020

fabriziopandini mentioned this pull request Mar 30, 2020

Make clusterctl cert-manager timeout configurable #2822

Closed

k8s-ci-robot assigned wfernandes Apr 3, 2020

Fixes default control, worker machine counts overriding user specifie…

02ec8e4

…d values - machine count values assigned in the order: defaults, env vars, flags

gab-satchi force-pushed the 2560-replica-count branch from ded89fc to 02ec8e4 Compare April 3, 2020 21:45

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 3, 2020

k8s-ci-robot merged commit bf4fcea into kubernetes-sigs:master Apr 3, 2020

gab-satchi deleted the 2560-replica-count branch April 6, 2020 12:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🐛 Fixes default control, worker machine counts overriding user specified values #2597

🐛 Fixes default control, worker machine counts overriding user specified values #2597

gab-satchi commented Mar 9, 2020

k8s-ci-robot commented Mar 9, 2020

nader-ziada commented Mar 9, 2020

vincepri commented Mar 9, 2020

CecileRobertMichon Mar 9, 2020

gab-satchi Mar 9, 2020

fabriziopandini left a comment

gab-satchi commented Mar 10, 2020

vincepri commented Mar 10, 2020

gab-satchi commented Mar 10, 2020

fabriziopandini left a comment •

edited

Loading

fabriziopandini commented Mar 12, 2020

fabriziopandini commented Mar 12, 2020

gab-satchi commented Mar 16, 2020

vincepri commented Mar 16, 2020

k8s-ci-robot commented Mar 16, 2020

vincepri commented Mar 16, 2020

vincepri commented Mar 30, 2020

wfernandes commented Apr 3, 2020

wfernandes commented Apr 3, 2020

🐛 Fixes default control, worker machine counts overriding user specified values #2597

🐛 Fixes default control, worker machine counts overriding user specified values #2597

Conversation

gab-satchi commented Mar 9, 2020

k8s-ci-robot commented Mar 9, 2020

nader-ziada commented Mar 9, 2020

vincepri commented Mar 9, 2020

CecileRobertMichon Mar 9, 2020

Choose a reason for hiding this comment

gab-satchi Mar 9, 2020

Choose a reason for hiding this comment

fabriziopandini left a comment

Choose a reason for hiding this comment

gab-satchi commented Mar 10, 2020

vincepri commented Mar 10, 2020

gab-satchi commented Mar 10, 2020

fabriziopandini left a comment • edited Loading

Choose a reason for hiding this comment

fabriziopandini commented Mar 12, 2020

fabriziopandini commented Mar 12, 2020

gab-satchi commented Mar 16, 2020

vincepri commented Mar 16, 2020

k8s-ci-robot commented Mar 16, 2020

vincepri commented Mar 16, 2020

vincepri commented Mar 30, 2020

wfernandes commented Apr 3, 2020

wfernandes commented Apr 3, 2020

fabriziopandini left a comment •

edited

Loading