Skip to content

Make kubepkg tests independent from the internet #1282

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

Merged
merged 1 commit into from
May 13, 2020
Merged

Make kubepkg tests independent from the internet #1282

merged 1 commit into from
May 13, 2020

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented May 13, 2020

What type of PR is this?

/kind api-change
/kind failing-test

What this PR does / why we need it:

We now use the already existing mock clients to avoid internet access
during the test execution. This now allows further test enhancements to
increase the overall test coverage of the kubepkg package.

Which issue(s) this PR fixes:

Fixes #1000

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

- Added `kubepkg.Client` struct type to allow better encapsulation (has to be created via `kubepkg.New()`)

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. area/release-eng Issues or PRs related to the Release Engineering subproject sig/release Categorizes an issue or PR as relevant to SIG Release. labels May 13, 2020
@fejta-bot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

Copy link
Member

@justaugustus justaugustus left a comment

Choose a reason for hiding this comment

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

@saschagrunert -- A few nits.

We now use the already existing mock clients to avoid internet access
during the test execution. This now allows further test enhancements to
increase the overall test coverage of the kubepkg package.

Signed-off-by: Sascha Grunert <[email protected]>
Comment on lines +161 to +171
func run(ro *rootOptions, buildType kubepkg.BuildType) error {
client := kubepkg.New()
builds, err := client.ConstructBuilds(
buildType, ro.packages, ro.channels, ro.kubeVersion, ro.revision,
ro.cniVersion, ro.criToolsVersion, ro.templateDir,
)
if err != nil {
return errors.Wrap(err, "running kubepkg")
}
return client.WalkBuilds(builds, ro.architectures, ro.specOnly)
}
Copy link
Member Author

Choose a reason for hiding this comment

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

From a general usage I'm wondering if something like this would be even better:

func run(ro *rootOptions, buildType kubepkg.BuildType) error {
	client := kubepkg.New()
	builds, err := client.ConstructBuilds(ro)
	if err != nil {
		return err
	}
	return build.Walk()
}

Copy link
Member

Choose a reason for hiding this comment

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

@saschagrunert -- 👆 looks much cleaner :)

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 can change it as a follow-up if you want. I wanted to bump the test coverage in any case for that package after that PR got merged.

Copy link
Member

Choose a reason for hiding this comment

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

Yep. Follow up is fine.

@justaugustus
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 13, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justaugustus, saschagrunert

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 13, 2020
@justaugustus
Copy link
Member

@saschagrunert -- can you fix up the release note?

@saschagrunert
Copy link
Member Author

@saschagrunert -- can you fix up the release note?

Yes, done 👍

@k8s-ci-robot k8s-ci-robot merged commit 05b87eb into kubernetes:master May 13, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone May 13, 2020
@saschagrunert saschagrunert deleted the kubepkg-test-no-internet branch May 13, 2020 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-eng Issues or PRs related to the Release Engineering subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

kubepkg tests fail
4 participants