Deployment unit tests #646

enxebre · 2018-12-18T15:44:12Z

What this PR does / why we need it:
Initial PR to increase test coverage for machineDeployment controller

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 #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

k8s-ci-robot · 2018-12-18T15:44:28Z

Hi @enxebre. Thanks for your PR.

I'm waiting for a kubernetes-sigs or kubernetes 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.

enxebre · 2018-12-18T15:45:13Z

pkg/controller/machineset/controller.go

@@ -50,7 +50,7 @@ var stateConfirmationInterval = 100 * time.Millisecond
 // and Start it when the Manager is Started.
 func Add(mgr manager.Manager) error {
 	r := newReconciler(mgr)
-	return add(mgr, r, r.MachineSetToMachines)
+	return add(mgr, r, r.MachineToMachineSets)


analogous to https://github.com/kubernetes-sigs/cluster-api/blob/master/pkg/controller/machinedeployment/controller.go#L258

scruplelesswizard · 2018-12-18T16:55:23Z

/ok-to-test

frobware · 2018-12-18T17:33:41Z

pkg/controller/machinedeployment/controller_test.go

+		},
+	}
+	controller := true
+	ms := v1alpha1.MachineSet{


Given that we enumerate the other instances (ms2, ms3), why not make this ms1?

frobware · 2018-12-18T17:33:52Z

pkg/controller/machinedeployment/controller_test.go

+			machineDeployment,
+		},
+	}
+	ms := v1alpha1.MachineSet{


Given that we enumerate the others, why not make this ms1?

roberthbailey · 2018-12-18T21:28:56Z

/assign @frobware

k8s-ci-robot · 2018-12-18T21:28:57Z

@roberthbailey: GitHub didn't allow me to assign the following users: frobware.

Note that only kubernetes-sigs members and repo collaborators can be assigned.
For more information please see the contributor guide

In response to this:

/assign @frobware

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.

frobware · 2018-12-19T11:27:54Z

LGTM @roberthbailey

enxebre · 2018-12-20T13:15:12Z

/test pull-cluster-api-test

vincepri

Only some minor comments.

/lgtm

vincepri · 2018-12-20T16:59:46Z

pkg/controller/machinedeployment/controller.go

+			},
+		},
+	}
+	err := r.Client.List(context.Background(), listOptions, machineSets)
 	if err != nil {


The above could be simplified with if err := ...; err != nil {.

vincepri · 2018-12-20T17:00:00Z

pkg/controller/machinedeployment/controller.go

+			},
+		},
+	}
+	err := r.Client.List(context.Background(), listOptions, dList)
 	if err != nil {


Same here, can be simplified with if err := ...; err != nil {.

vincepri · 2018-12-20T17:00:48Z

pkg/controller/machinedeployment/controller.go

@@ -230,7 +252,7 @@ func (r *ReconcileMachineDeployment) getMachineMapForDeployment(d *v1alpha1.Mach
 		return nil, err
 	}
 	machines := &v1alpha1.MachineList{}
-	err = r.List(context.Background(), client.InNamespace(d.Namespace).MatchingLabels(selector), machines)
+	err = r.Client.List(context.Background(), client.InNamespace(d.Namespace).MatchingLabels(selector), machines)
 	if err != nil {


Should we use client.ListOptions here? Mostly to be consistent.

roberthbailey · 2018-12-21T08:02:23Z

/approve
/hold

Please remove the hold once all comments have been addressed.

k8s-ci-robot · 2018-12-21T08:02:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, roberthbailey

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:

~~OWNERS~~ [roberthbailey]

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

enxebre · 2018-12-21T11:13:21Z

thanks all for having a look, all comments addressed now

enxebre · 2018-12-21T11:24:03Z

/test pull-cluster-api-test

scruplelesswizard · 2018-12-21T14:00:14Z

/lgtm
Reiterate lgtm as all changes have been made as requested

scruplelesswizard · 2018-12-21T14:00:33Z

/hold cancel

…st-k8s-versions only document latest Kubernetes patch versions

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 18, 2018

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 18, 2018

k8s-ci-robot requested review from jessicaochen and roberthbailey December 18, 2018 15:44

enxebre commented Dec 18, 2018

View reviewed changes

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 Dec 18, 2018

frobware suggested changes Dec 18, 2018

View reviewed changes

enxebre force-pushed the deployment-unit-tests branch from 543335a to 4f6c5e6 Compare December 18, 2018 17:42

enxebre force-pushed the deployment-unit-tests branch from 4f6c5e6 to 2b9bcd1 Compare December 20, 2018 13:06

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 20, 2018

vincepri approved these changes Dec 20, 2018

View reviewed changes

k8s-ci-robot assigned vincepri Dec 20, 2018

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 20, 2018

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

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Dec 21, 2018

Increase unit test coveraget for machineDeployment controller

651b962

enxebre force-pushed the deployment-unit-tests branch from 3024092 to f6010da Compare December 21, 2018 11:10

k8s-ci-robot removed the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 21, 2018

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 21, 2018

enxebre force-pushed the deployment-unit-tests branch from f6010da to bcd3145 Compare December 21, 2018 11:12

enxebre added 2 commits December 21, 2018 12:18

Keep naming consistency for mapping function

a70f6bf

Add inline error checks

f2552c9

enxebre force-pushed the deployment-unit-tests branch from bcd3145 to f2552c9 Compare December 21, 2018 11:18

k8s-ci-robot assigned scruplelesswizard Dec 21, 2018

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 21, 2018

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

k8s-ci-robot merged commit d19e6b6 into kubernetes-sigs:master Dec 21, 2018

jayunit100 pushed a commit to jayunit100/cluster-api that referenced this pull request Jan 31, 2020

Merge pull request kubernetes-sigs#646 from andrewsykim/only-use-late…

702304a

…st-k8s-versions only document latest Kubernetes patch versions

enxebre mentioned this pull request Feb 5, 2020

REQUEST: New membership for enxebre kubernetes/org#1614

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deployment unit tests #646

Deployment unit tests #646

enxebre commented Dec 18, 2018

k8s-ci-robot commented Dec 18, 2018

enxebre Dec 18, 2018

scruplelesswizard commented Dec 18, 2018

frobware Dec 18, 2018

frobware Dec 18, 2018

roberthbailey commented Dec 18, 2018

k8s-ci-robot commented Dec 18, 2018

frobware commented Dec 19, 2018

enxebre commented Dec 20, 2018

vincepri left a comment

vincepri Dec 20, 2018

vincepri Dec 20, 2018

vincepri Dec 20, 2018

roberthbailey commented Dec 21, 2018

k8s-ci-robot commented Dec 21, 2018

enxebre commented Dec 21, 2018

enxebre commented Dec 21, 2018

scruplelesswizard commented Dec 21, 2018

scruplelesswizard commented Dec 21, 2018

Deployment unit tests #646

Deployment unit tests #646

Conversation

enxebre commented Dec 18, 2018

k8s-ci-robot commented Dec 18, 2018

enxebre Dec 18, 2018

Choose a reason for hiding this comment

scruplelesswizard commented Dec 18, 2018

frobware Dec 18, 2018

Choose a reason for hiding this comment

frobware Dec 18, 2018

Choose a reason for hiding this comment

roberthbailey commented Dec 18, 2018

k8s-ci-robot commented Dec 18, 2018

frobware commented Dec 19, 2018

enxebre commented Dec 20, 2018

vincepri left a comment

Choose a reason for hiding this comment

vincepri Dec 20, 2018

Choose a reason for hiding this comment

vincepri Dec 20, 2018

Choose a reason for hiding this comment

vincepri Dec 20, 2018

Choose a reason for hiding this comment

roberthbailey commented Dec 21, 2018

k8s-ci-robot commented Dec 21, 2018

enxebre commented Dec 21, 2018

enxebre commented Dec 21, 2018

scruplelesswizard commented Dec 21, 2018

scruplelesswizard commented Dec 21, 2018