kubeadm: aggregate all the errors when the shared certs are validated #106042
Conversation
k8s-ci-robot
added
release-note-none
|
/sig cluster-lifecycle |
| @@ -29,6 +29,7 @@ import ( | |||
| "k8s.io/client-go/util/keyutil" | |||
| "k8s.io/klog/v2" | |||
|
|
|||
| utilerrors "k8s.io/apimachinery/pkg/util/errors" | |||
There was a problem hiding this comment.
this should be in the group above:
"k8s.io/client-go/util/keyutil"
"k8s.io/klog/v2"
| } | ||
| } | ||
|
|
||
| if len(errs) != 0 { | ||
| return false, utilerrors.NewAggregate(errs) |
There was a problem hiding this comment.
this is worth updating the unit tests to check how many errors were returned exactly:
https://github.com/kubernetes/kubernetes/blob/e363bbdddb17100e6cc41a36c83caac49ea4c3c7/cmd/kubeadm/app/phases/certs/certs_test.go#L378
expectedError bool -> expectedErrors int
len(err) != len(expectedErrors) { unit test failed, print err }
There was a problem hiding this comment.
Just found that testcase "missing etcd/ca.crt" is not wrote correctly, it is just a copy of "missing front-proxy.crt". 😄
|
/triage accepted LGTM, other than the two comments above. |
k8s-ci-robot
added
triage/accepted
| case test.expectedError && err == nil: | ||
| case err != nil: | ||
| if agg, ok := err.(utilerrors.Aggregate); ok && len(agg.Errors()) != test.expectedErrors { | ||
| t.Errorf("SharedCertificateExists didn't failed with expected error numbers") |
There was a problem hiding this comment.
| t.Errorf("SharedCertificateExists didn't failed with expected error numbers") | |
| t.Errorf("SharedCertificateExists didn't fail with the expected number of errors, expected: %v, got: %v", ....) |
we should also include the error numbers.
| if agg, ok := err.(utilerrors.Aggregate); ok && len(agg.Errors()) != test.expectedErrors { | ||
| t.Errorf("SharedCertificateExists didn't failed with expected error numbers") | ||
| } | ||
| case err == nil && test.expectedErrors != 0: | ||
| t.Errorf("error SharedCertificateExists didn't failed when expected") |
There was a problem hiding this comment.
| t.Errorf("error SharedCertificateExists didn't failed when expected") | |
| t.Errorf("error SharedCertificateExists didn't fail when expected") |
^ there is also a typo in the old code
|
/retitle kubeadm: aggregate all the errors when the shared certs are validated |
k8s-ci-robot
changed the title
Instead of the individual error and return, it's better to aggregate all the errors so that we can fix them all at once. Take the chance to fix some comments, since kubeadm are not checking that the certs are equal across controlplane. Signed-off-by: Dave Chen <dave.chen@arm.com>
|
@neolit123 thanks for the review, could you pls take a look again? |
|
/retest |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chendave, neolit123 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:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Instead of the individual error and return, it's better to aggregate all the errors so that we can fix them all at once.
Take the chance to fix some comments, since kubeadm are not checking that the certs are equal across controlplane.
Signed-off-by: Dave Chen dave.chen@arm.com
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: