-
Notifications
You must be signed in to change notification settings - Fork 95
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
move pkg, cmd & test folders in inside prow to the root of the repo #101
Conversation
✅ Deploy Preview for k8s-prow ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
14a86c3
to
ec2a684
Compare
5c8857e
to
025e887
Compare
We need to merge the linked PR in test-infra to run the failing integration/image-build job. |
If we want to redefine the folders structure I think we should take
Now we are going to have such a structure:
that is a bit incosistent IMHO. |
I'm assuming this is following the guidelines from this page: https://go.dev/doc/modules/layout, specifically this section seems to be most applicable to the contents of our repo: https://go.dev/doc/modules/layout#packages-and-commands-in-the-same-repository We'll also need to create an announcement and include a migration guide since this is a backwards incompatible change for consumers that depend on these go packages. Perhaps you can provide a |
I can send another email to the existing announcement about the updated import paths. Prow lib consumers will hopefully run into this problem +/-7 days from this comment.
That is right, all the programs will live in cmd/* and libraries will live in pkg/*, we don't have internal libraries yet but we should start doing that soon. I'll push a separate commit moving ghproxy to the cmd folder Can you approve the PR in test-infra to fix the tests? |
Yep, I'll approve the test-infra PR. Please don't merge it until this PR has been updated to move ghproxy as well and is also ready to merge. These PRs need to merge together so if there is a problem with either we'll need to quickly revert. |
|
This is ready to be merged. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@upodroid PTAL!
@@ -1,6 +1,8 @@ | |||
_bin/ | |||
_output/ | |||
.python_virtual_env | |||
/yarn.lock |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suggest to remove this line, to version control the yarn.lock
file;
please see yarnpkg/yarn#1583
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When we are building images or running deck locally, we use yarn to generate the node_modules and yarn.lock and run hack/ts-rollup
to create the final js files that go in the container. When the build fails, we get a dirty git tree but these folders should never be committed. We are building the js code in a very unusual manner.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not objecting to, actually am agreeing to, add 'node_modules' directory to gitignore.
What I am suggesting is that we SHOULD version control the 'yarn.lock' file, and it's just a single file, not a directory.
Oh, okay.
/label tide/merge-method-squash |
3106dee
to
a9dd884
Compare
@@ -77,6 +77,6 @@ fi | |||
--static-files-location="$DIR/kodata/static" \ | |||
--template-files-location="$DIR/kodata/template" \ | |||
--spyglass-files-location="$DIR/kodata/lenses" \ | |||
--config-path "${DIR}/../../../config/prow/config.yaml" \ | |||
--config-path "${DIR}/../../test/integration/config/prow/deck.yaml" \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When deck is being developed locally, it assumes the prow config at https://github.com/kubernetes/test-infra/blob/master/config/prow/config.yaml is in the repo which is no longer true. I copied the prod config and stored it next to the integration config.yaml. I can confirm that running ./cmd/deck/runlocal
runs deck locally on my laptop and it works nicely.
cmd/ghproxy/ghproxy | ||
pj.yaml |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about adding vendor/
to .gitignore
?
[Refs]
- chore: update deps for sigs.k8s.io/controller-runtime@v0.16.3 - step 1 #106 (comment)
- https://github.com/github/gitignore/blob/main/Go.gitignore
cmd/ghproxy/ghproxy | |
pj.yaml | |
cmd/ghproxy/ghproxy | |
vendor/ | |
pj.yaml |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Patricia has that change in #106, if we add it here she'll need to respin. Let's just merge this and then the dep bump. 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, also not sure why we need to ignore vendor. I'll take a further look at 106
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't vendor in Prow so having it in gitignore helps people realize that before submitting dep bump PRs
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: petr-muller, upodroid 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 |
CI changes are in place, this passes tests => |
doc: Update `cmd`, `pkg`, & `test` paths (follow-up of #101)
* Update outdated links * Remove references to deleted tools (phaino, migratestatus) * Update links for 'k/t-i' to 'k-s/prow' * docs: Remove Phaino-related paragraph * docs: Reflect code file path changes by #101 * docs: Reflect code file path changes by #101 (part2) * docs: Reflect code file path changes by #101 (part3; ghProxy) * Update checkconfig testcode to suppress error * Fix errors and nits
* Update outdated links * Remove references to deleted tools (phaino, migratestatus) * Update links for 'k/t-i' to 'k-s/prow' * docs: Remove Phaino-related paragraph * docs: Reflect code file path changes by kubernetes-sigs#101 * docs: Reflect code file path changes by kubernetes-sigs#101 (part2) * docs: Reflect code file path changes by kubernetes-sigs#101 (part3; ghProxy) * Update checkconfig testcode to suppress error * Fix errors and nits
* Update outdated links * Remove references to deleted tools (phaino, migratestatus) * Update links for 'k/t-i' to 'k-s/prow' * docs: Remove Phaino-related paragraph * docs: Reflect code file path changes by kubernetes-sigs#101 * docs: Reflect code file path changes by kubernetes-sigs#101 (part2) * docs: Reflect code file path changes by kubernetes-sigs#101 (part3; ghProxy) * Update checkconfig testcode to suppress error * Fix errors and nits
No description provided.