Local dependencies #2835

johnpoth · 2021-12-15T11:16:42Z

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

Thanks !

Release Note

feat(build): local file dependencies

oscerd

Minor findings.

e2e/registry/files/src/main/java/camelk/DeterministicDecryption.java

oscerd · 2021-12-15T11:19:38Z

pkg/cmd/run.go

@@ -18,17 +18,20 @@ limitations under the License.
 package cmd


johnpoth · 2022-02-08T12:17:19Z

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 · 2022-02-21T10:07:04Z

cc @astefanutti @oscerd @lburgazzoli

johnpoth · 2022-03-07T10:23:56Z

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 :)

…d in the running container

…arent directory

…'s CA and Authentication with Maven when using the Image Registry as a Maven Registry

johnpoth · 2022-03-31T08:51:17Z

rebased from main branch @astefanutti @lburgazzoli

squakez

Nice work. Maybe we need to provide some detailed example as a follow up activity, but good to merge for me.

johnpoth · 2022-04-04T10:00:09Z

Thanks @squakez @oscerd ! All right here goes nothing ... merging !

astefanutti

@johnpoth awesome work. Sorry for the late review, I've left a couple of comments / questions.

pkg/cmd/run.go

pkg/util/camel/camel_dependencies.go

pkg/apis/camel/v1/maven_types.go

johnpoth · 2022-04-04T10:49:26Z

No worries @astefanutti ! Always nice to read your thoughtful comments! I can address these in a follow up PR no problem

fix #2835 address comments

oscerd approved these changes Dec 15, 2021

View reviewed changes

astefanutti added area/build-operator Related to the internal image build operator kind/feature New feature or request labels Dec 15, 2021

johnpoth force-pushed the local-dependencies branch 5 times, most recently from c0dcc85 to b6d03a0 Compare February 8, 2022 09:01

johnpoth marked this pull request as ready for review February 8, 2022 12:17

johnpoth force-pushed the local-dependencies branch from b6d03a0 to 9e5deed Compare February 8, 2022 15:01

johnpoth force-pushed the local-dependencies branch from 9e5deed to 3d5c1b5 Compare March 7, 2022 10:59

johnpoth added 16 commits March 31, 2022 10:39

Fix apache#2834: support local dependencies through the Image repository

844a683

Fix apache#2834: Refactor

18a8bf1

Fix apache#2834: Handle pom files

f524f35

Fix apache#2834: e2e tests

92caf7d

Fix apache#2834: Update wagon-docker-registry

b2cf586

Fix apache#2834: Update command line option

0eb6e9b

Fix apache#2834: Support all packaging types

2489fc6

Fix apache#2834: fix tests

087ea52

Fix apache#2834: Let users configure where the files are to be mounte…

57dcb9a

…d in the running container

Fix apache#2834: Support OpenShift

69a4dc3

Fix apache#2834: Add E2E for local files mounted in a running countainer

0803a06

Fix apache#2834: Add E2E for local files mounted in custom path

f630b86

Fix apache#2834: Add ability to upload directory

5f8ae0a

Fix apache#2834: Add E2E for local directory

7188541

Fix apache#2834: Let's make the default targetpath relative to it's p…

e6a2821

…arent directory

Fix apache#2834: upload checksum files

f45f7e4

johnpoth added 14 commits March 31, 2022 10:39

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

Fix apache#2834: support OpenShift defaults

738ee6f

Fix apache#2834: don't enable registry trait if explicitely disabled

feacfac

Fix apache#2834: generate resource and rebase

594a1b9

Fix apache#2834: update to latest wagon-docker-registry

a188235

Fix apache#2834: fix lint errors

5e70d25

Fix apache#2834: enable maven wagon IT tests in github for kubernetes

3f90733

Fix apache#2834: upgrade Spectrum

080d421

Fix apache#2834: Update docs

26423a2

Fix apache#2834: Update health trait

6d72554

Fix apache#2834: Refactor E2E test to use single namespace

e2f1a6e

Fix apache#2834: Fix e2e tests, let's wait until camel-k is installed

407016f

Fix apache#2834: kustomize 2e2 test should be executed last

d6660dc

Fix apache#2834: rebase main

3c5ba76

johnpoth force-pushed the local-dependencies branch from 3d5c1b5 to 3c5ba76 Compare March 31, 2022 08:49

squakez approved these changes Apr 1, 2022

View reviewed changes

johnpoth merged commit bd12e7f into apache:main Apr 4, 2022

johnpoth deleted the local-dependencies branch April 4, 2022 10:00

squakez mentioned this pull request Apr 4, 2022

Local dependencies examples #3167

Closed

astefanutti reviewed Apr 4, 2022

View reviewed changes

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 added a commit to johnpoth/camel-k that referenced this pull request Apr 5, 2022

fix apache#2835 address comments

6111511

johnpoth mentioned this pull request Apr 5, 2022

fix #2835 address comments #3171

Merged

johnpoth added a commit to johnpoth/camel-k that referenced this pull request Apr 5, 2022

fix apache#2835 address comments

36ec1d0

johnpoth added a commit to johnpoth/camel-k that referenced this pull request Apr 6, 2022

fix apache#2835 address comments

08ed9ed

johnpoth added a commit to johnpoth/camel-k that referenced this pull request Apr 6, 2022

fix apache#2835 address comments

eed9837

johnpoth added a commit that referenced this pull request Apr 8, 2022

Merge pull request #3171 from johnpoth/local-dependencies-2

dcd7e34

fix #2835 address comments

squakez pushed a commit to squakez/camel-k that referenced this pull request Apr 11, 2022

fix apache#2835 address comments

59f735f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Local dependencies #2835

Local dependencies #2835

johnpoth commented Dec 15, 2021 •

edited by squakez

Loading

oscerd left a comment

oscerd Dec 15, 2021

johnpoth commented Feb 8, 2022

johnpoth commented Feb 21, 2022

johnpoth commented Mar 7, 2022

johnpoth commented Mar 31, 2022

squakez left a comment

johnpoth commented Apr 4, 2022

astefanutti left a comment

johnpoth commented Apr 4, 2022

		@@ -18,17 +18,20 @@ limitations under the License.
		package cmd

Local dependencies #2835

Local dependencies #2835

Conversation

johnpoth commented Dec 15, 2021 • edited by squakez Loading

oscerd left a comment

Choose a reason for hiding this comment

oscerd Dec 15, 2021

Choose a reason for hiding this comment

johnpoth commented Feb 8, 2022

johnpoth commented Feb 21, 2022

johnpoth commented Mar 7, 2022

johnpoth commented Mar 31, 2022

squakez left a comment

Choose a reason for hiding this comment

johnpoth commented Apr 4, 2022

astefanutti left a comment

Choose a reason for hiding this comment

johnpoth commented Apr 4, 2022

johnpoth commented Dec 15, 2021 •

edited by squakez

Loading