Refactor metadata.go to test that k8s client is initialized iff ec2 metadata is unavailable #902
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: wongma7 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
approved
wongma7
added
the
kind/cleanup
Pull Request Test Coverage Report for Build 1991
💛 - Coveralls |
wongma7
commented
May 25, 2021
| if m.GetInstanceID() != tc.identityDocument.InstanceID { | ||
| t.Fatalf("GetInstanceID() failed: expected %v, got %v", tc.identityDocument.InstanceID, m.GetInstanceID()) | ||
| if clientsetInitialized == true { | ||
| t.Errorf("kubernetes client was unexpectedly initialized when metadata is available!") |
There was a problem hiding this comment.
here is the relevant part where we test that clientset initialization func did not get called.
rest of changes in this test file are mainly renaming and simplifying/collapsing some branching
…etadata is unavailable
|
actually instead of manually testing I want #907 to test it. existing kops job will check box 1 |
|
close in favor of #907 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Is this a bug fix or adding new feature? /kind cleanup
What is this PR about? / Why do we need it? found in #897 that it's hard to test whether the k8s client has been initialized or not. in part because NewMetadataService accepts a kubernetes.Interface and you can't check if it's nil.
Refactored NewMetadataService to accept a func that returns a kubernetes.Interface... it's not pretty but should work.
(Also, I removed NewMetadata. Some of this code is hella confusing since we kept the naming of Metadata even though it can be constructed from k8s api now, not just ec2 instance metadata. I stopped short of renaming it, maybe to InstanceInfo or NodeInfo, because I already got a bit carried away with what is supposed to be a simple refactor, may do it later.)
What testing is done? TODO: e2e test on my eks cluster