Skip to content
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

oci-support feature branch #2666

Merged
merged 1 commit into from
Jan 26, 2022
Merged

Conversation

loudej
Copy link
Contributor

@loudej loudej commented Jan 26, 2022

oci-support rebased on main and squash merged for pull request.

See design docs for usage patterns. Primarily:

  • Accepts oci://image:tag and oci://image@sha256:digest arguments in commands where a git location would be expected.
  • Sub-package path is delimited by double-slash, e.g. oci://image//subdir:tag
  • Adds oci support to upstream and upstreamLock in Kptfile
  • Two new commands, kpt pkg pull [DIR] --origin oci://... and kpt pkg push [DIR]

Rebased on main and squashed
@loudej
Copy link
Contributor Author

loudej commented Jan 26, 2022

Hi @martinmaly - here's squash-merge of experimental oci-support like you mentioned

Here's a working (?) e2e demo.sh of several ways it can be used. If you clone the repo the makefile should also be able to make a local ./bin/kpt of the right version that won't conflict with anything machine-wide.

And here's a resulting of a Kptfile from a package made by demo.sh...

That's showing a clone where the upstream is oci. It was pulled down by kpt pkg pull which is why there's origin data added --- that's purely client-side data to have a default location it's removed by kpt pkg push while packing.

@martinmaly
Copy link
Contributor

Thank you!

@martinmaly martinmaly merged commit 9f7687f into kptdev:porch Jan 26, 2022
martinmaly added a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
martinmaly added a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>
martinmaly added a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
martinmaly added a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly pushed a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Rebased on main and squashed

Co-authored-by: Louis DeJardin <dejardin@google.com>

OCI: Fix Porch Build
martinmaly added a commit to martinmaly/kpt that referenced this pull request Feb 18, 2022
Preparing for merge of porch branch back into main.
This was referenced Feb 18, 2022
martinmaly added a commit that referenced this pull request Feb 18, 2022
Preparing for merge of porch branch back into main,

* Revert "Kpt location parsing (#2688)"
* Revert "oci-support feature branch (#2666)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants