The Wayback Machine - https://web.archive.org/web/20220414214820/https://github.com/apache/camel-k/pull/2835
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

Jump to bottom

Local dependencies #2835

Merged
merged 35 commits into from Apr 4, 2022
Merged

Local dependencies #2835

merged 35 commits into from Apr 4, 2022

Conversation

johnpoth
Copy link
Member

@johnpoth johnpoth commented Dec 15, 2021 •
edited by squakez

Requires container-tools/spectrum#7 and a few enhancements but the core is here :)

Thanks !

Closes #1227

Release Note

feat(build): local file dependencies
oscerd
oscerd approved these changes Dec 15, 2021
View changes
Copy link
Contributor

@oscerd oscerd left a comment

Minor findings.
e2e/registry/files/src/main/java/camelk/DeterministicDecryption.java Show resolved Hide resolved
pkg/cmd/run.go
@@ -18,17 +18,20 @@ limitations under the License.
package cmd
Copy link
Contributor

@oscerd oscerd Dec 15, 2021

Choose a reason for hiding this comment

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

Ditto
@astefanutti astefanutti added area/build-system kind/feature labels Dec 15, 2021
@johnpoth johnpoth force-pushed the local-dependencies branch 5 times, most recently from c0dcc85 to b6d03a0 Compare Feb 8, 2022
@johnpoth
Copy link
Member Author

@johnpoth johnpoth commented Feb 8, 2022

Ok I think it's ready to be reviewed! The test failure seem unrelated. Feel free to comment on the wagon behavior as well if needed. To be compliant with various Registry vendors, we map Maven artifacts to Image names by: lower casing it's HTTP path, prefixed with maven_, . and / are replaced with _ so for example:

Maven artifact Maven HTTP path Image Name Image Tag
org.apache.ant:ant:jar:1.10.12 org/apache/ant/ant/1.10.12/ant-1.10.12.jar maven_org_apache_ant_ant_1_10_12_ant-1_10_12_jar 1.10.12

Artifacts stored in the Image Registry that are to be mounted in the running container use the URI: docker-mvn:groupId:artifactId:extension:version[@mount/path]. I think I'll add more docs once everything is merged.

Let me know what you think!

Thanks !
@johnpoth johnpoth marked this pull request as ready for review Feb 8, 2022
@johnpoth
Copy link
Member Author

@johnpoth johnpoth commented Feb 21, 2022

cc @astefanutti @oscerd @lburgazzoli
@johnpoth
Copy link
Member Author

@johnpoth johnpoth commented Mar 7, 2022

By the way let me know if I can do anything to help with the review, or if this PR is a bad idea in the first place :)
johnpoth added 16 commits Mar 31, 2022
@johnpoth
Fix apache#2834: support local dependencies through the Image repository
844a683
@johnpoth
Fix apache#2834: Refactor
18a8bf1
@johnpoth
Fix apache#2834: Handle pom files
f524f35
@johnpoth
Fix apache#2834: e2e tests
92caf7d
@johnpoth
Fix apache#2834: Update wagon-docker-registry
b2cf586
@johnpoth
Fix apache#2834: Update command line option
0eb6e9b
@johnpoth
Fix apache#2834: Support all packaging types
2489fc6
@johnpoth
Fix apache#2834: fix tests
087ea52
@johnpoth
Fix apache#2834: Let users configure where the files are to be mounte…
57dcb9a 
…d in the running container
@johnpoth
Fix apache#2834: Support OpenShift
69a4dc3
@johnpoth
Fix apache#2834: Add E2E for local files mounted in a running countainer
0803a06
@johnpoth
Fix apache#2834: Add E2E for local files mounted in custom path
f630b86
@johnpoth
Fix apache#2834: Add ability to upload directory
5f8ae0a
@johnpoth
Fix apache#2834: Add E2E for local directory
7188541
@johnpoth
Fix apache#2834: Let's make the default targetpath relative to it's p…
e6a2821 
…arent directory
@johnpoth
Fix apache#2834: upload checksum files
f45f7e4
johnpoth added 14 commits Mar 31, 2022
@johnpoth
Fix apache#2834: We should automatically register the Image Registry…
46b20f1 
…'s CA and Authentication with Maven when using the Image Registry as a Maven Registry
@johnpoth
Fix apache#2834: support OpenShift defaults
738ee6f
@johnpoth
Fix apache#2834: don't enable registry trait if explicitely disabled
feacfac
@johnpoth
Fix apache#2834: generate resource and rebase
594a1b9
@johnpoth
Fix apache#2834: update to latest wagon-docker-registry
a188235
@johnpoth
Fix apache#2834: fix lint errors
5e70d25
@johnpoth
Fix apache#2834: enable maven wagon IT tests in github for kubernetes
3f90733
@johnpoth
Fix apache#2834: upgrade Spectrum
080d421
@johnpoth
Fix apache#2834: Update docs
26423a2
@johnpoth
Fix apache#2834: Update health trait
6d72554
@johnpoth
Fix apache#2834: Refactor E2E test to use single namespace
e2f1a6e
@johnpoth
Fix apache#2834: Fix e2e tests, let's wait until camel-k is installed
407016f
@johnpoth
Fix apache#2834: kustomize 2e2 test should be executed last
d6660dc
@johnpoth
Fix apache#2834: rebase main
3c5ba76
@johnpoth
Copy link
Member Author

@johnpoth johnpoth commented Mar 31, 2022

rebased from main branch @astefanutti @lburgazzoli
squakez
squakez approved these changes Apr 1, 2022
View changes
Copy link
Contributor

@squakez squakez left a comment

Nice work. Maybe we need to provide some detailed example as a follow up activity, but good to merge for me.
@johnpoth
Copy link
Member Author

@johnpoth johnpoth commented Apr 4, 2022

Thanks @squakez @oscerd ! All right here goes nothing ... merging !
@johnpoth johnpoth merged commit bd12e7f into apache:main Apr 4, 2022
10 of 11 checks passed
@johnpoth johnpoth deleted the local-dependencies branch Apr 4, 2022
@squakez squakez mentioned this pull request Apr 4, 2022
Open
astefanutti
astefanutti reviewed Apr 4, 2022
View changes
Copy link
Member

@astefanutti astefanutti left a comment

@johnpoth awesome work. Sorry for the late review, I've left a couple of comments / questions.
pkg/cmd/run.go Show resolved Hide resolved
pkg/cmd/run.go Show resolved Hide resolved
pkg/util/camel/camel_dependencies.go Show resolved Hide resolved
pkg/apis/camel/v1/maven_types.go Show resolved Hide resolved
pkg/apis/camel/v1/maven_types.go Show resolved Hide resolved
@johnpoth
Copy link
Member Author

@johnpoth johnpoth commented Apr 4, 2022

No worries @astefanutti ! Always nice to read your thoughtful comments! I can address these in a follow up PR no problem
johnpoth added a commit to johnpoth/camel-k that referenced this issue Apr 5, 2022
@johnpoth
fix apache#2835 address comments
6111511
@johnpoth johnpoth mentioned this pull request Apr 5, 2022
Merged
johnpoth added a commit to johnpoth/camel-k that referenced this issue Apr 5, 2022
@johnpoth
fix apache#2835 address comments
36ec1d0
johnpoth added a commit to johnpoth/camel-k that referenced this issue Apr 6, 2022
@johnpoth
fix apache#2835 address comments
08ed9ed
johnpoth added a commit to johnpoth/camel-k that referenced this issue Apr 6, 2022
@johnpoth
fix apache#2835 address comments
eed9837
johnpoth added a commit that referenced this issue Apr 8, 2022
@johnpoth
Merge pull request #3171 from johnpoth/local-dependencies-2
dcd7e34 
fix #2835 address comments
squakez added a commit to squakez/camel-k that referenced this issue Apr 11, 2022
@johnpoth @squakez
fix apache#2835 address comments
59f735f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build-system kind/feature
4 participants
@johnpoth @astefanutti @oscerd @squakez