Merge railgun and kubernetes-testing-framework into KIC (rework of #1032) #1037
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
Fix #6 Co-authored-by: Shane Utt <[email protected]>
git rm railgun/go.{mod,sum}
env GOPRIVATE=github.com/kong/kubernetes-testing-framework go get github.com/kong/[email protected]
go mod tidy
Co-authored-by: Shane Utt <[email protected]>
This disables linter for the railgun/ directory, because railgun/ doesn't pass linting at the moment of writing, the fix is not trivial (because kubebuilder directives trip the line length linter, for example), and modifying railgun is outside of the scope of this PR.
Codecov Report
@@ Coverage Diff @@
## next #1037 +/- ##
==========================================
- Coverage 53.67% 52.92% -0.76%
==========================================
Files 34 35 +1
Lines 3193 3248 +55
==========================================
+ Hits 1714 1719 +5
- Misses 1347 1397 +50
Partials 132 132
Continue to review full report at Codecov.
|
rainest
approved these changes
Feb 17, 2021
shaneutt
approved these changes
Feb 17, 2021
Closed
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.
This technical PR does the same thing as what #1032 was intended to do - copies commits from "railgun" and "kubernetes-testing-framework" repos to the
railgun/andpkg/k8stest/directories respectively, and performs further housekeeping tasks as explained in the description of #1032.The problem with #1032 lies in GitHub's failure to attribute file changes to contributors, if these changes happened in a subtree (the list of contributors on a file showed only the
git subtreecommitter, but not the authors of the commits within that subtree). This PR is a workaround for that issue.This PR takes an alternative approach - takes original commits from these foreign repositories,
format-patches them, updated all directory paths in these patches (/->/railgunand/->/pkg/k8stest, respectively), andgit ams them.This PR has been tested for equivalency with #1032 (857d942) by preforming
git diff 857d942 HEAD, which yielded an empty diff.