This repository was archived by the owner on Dec 6, 2024. It is now read-only.
monorepo: add imported controller #72
Merged
Conversation
This file contains hidden or 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
Go version 1.13, helper scripts
This avoids dependencies on the Go module cache or the upstream code hosting.
prow.sh: use vendor directory if available
Depending on the error, those logs are needed to debug failures.
prow.sh: also log output of system containers
Inside a real Prow job it is better to clean up at runtime instead of leaving that to the Prow job cleanup code because the later sometimes times out. Signed-off-by: Mucahit Kurt <[email protected]>
…r-cleanup delete kind cluster after tests run
Signed-off-by: Grant Griffiths <[email protected]>
…a_crds Add snapshotter CRDs after cluster setup
Adding build for ppc64le
kind v0.6.0 appends the kubeconfig with the default config at ~/.kube/config.
Use kind v0.6.0
…ure can be tested. Test cases that test accessing volumes from multiple nodes need to be skipped
Signed-off-by: Grant Griffiths <[email protected]>
Enable topology testing with hostpath driver
…ve_version_gt Improve snapshot-controller running check and version_gt to support multiple formats
fix syntax for ppc64le build
Improve README by adding an explicit Kubernetes dependency section
This requires adding one more parallel e2e test run with a special focus flag because snapshot tests are still guarded with a "[Feature:VolumeSnapshotDataSource]" tag. The setting that skips all tests with "[Feature:.*]" has to be removed because it overrides the focus. We don't have serial snapshot tests yet. This needs to be modified again if we add any in the future.
Enable snapshot tests in 1.17 to be run in non-alpha jobs.
Signed-off-by: Grant Griffiths <[email protected]>
…ubernetes_fix Fix version_gt to work with Kubernetes prefix
…Version Update prow hostpath driver version to 1.3.0-rc2
Fix overriding of junit results
Add shanduur to owners file
k8s-ci-robot
added
approved
|
|
k8s-ci-robot
added
the
cncf-cla: no
|
@xing-yang I see several CLA issues related to the older controller repo commits. Is this something that can be worked around? I'm not sure how to resolve this otherwise, unless we squash all commits from the controller, which won't preserve history. [update] |
|
I see most of those commits are from Grant. Let me ping him and see if he has a new github id. |
Is that okay to do? That will strip the original author's attribution and rewrite a few commits in the git history. |
|
Hi, sorry this is causing some headache. I no longer work for Portworx or use [email protected]. Because of that, I had removed [email protected] from my github profile. We can try a few things:
|
|
/retest |
BlaineEXE
force-pushed
the
merge-add-imported-controller
branch
from
32431a9 to
a64576d
Compare
|
Thanks, @ggriffiths ! It looks like that allowed the commits with your ID to pass EasyCLA. Now there is just the remaining unknown user. If it's okay, would you leave your portworx email added on GitHub for the next 2-3 weeks while we work on merging these repos? Much appreciated! |
|
I can't find the GitHub user "Niu Lechuan" associated with this commit: 3b88f29. It seems the user may have removed their account. I think the best I can do in the circumstance is to rewrite the commit with my own info. It's a small doc update, so I am not concerned about validating that I believe the commit to be safe and up to my own contribution standards. |
Sure, will do. |
BlaineEXE
force-pushed
the
merge-add-imported-controller
branch
from
a64576d to
605062d
Compare
|
I'm going to start adding notes here, because editing that commit is proving to be extremely hard. Commit 3b88f29 is commit 159, as a note.
|
|
@xing-yang here is the response I got from TLF. We are advised to force merge without passing EasyCLA check. In this case, I think we have documented well that there is one PR not passing, and why, so we should have enough information recorded to explain if anyone asks us why. 
|
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: BlaineEXE, xing-yang 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 |
This was referenced Jun 14, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 is the first step in merging repos, using
monorepoas the working/feature branch.This PR does exactly 2 things:
./pkgdirgit subtree add --prefix pkg/imported-controller controller/masterwhere controller is https://github.com/kubernetes-sigs/container-object-storage-interface-controllerThis adds all 341 controller commits (with history intact), plus the subtree commit to merge them. Due to the huge scope, no other changes are made.