feat(#1656) : Add Jib publish strategy #4680

gansheer · 2023-08-21T16:22:44Z

Addition of a new strategy leveraging Jib:

Add publish jib strategy compatible with incremental build and native build
Use google jib maven plugin
Use builder maven profiles trait to configure jib plugin
- The ConfigMap is created with:
  - maven jib plugin profile content in profile.xml
  - kit as an owner
- The Jib Profile is used in the Jib published strategy

What will be done in later PRs:

extract plugin version in camel-k-runtime
refactor the way we interact with maven to be able to reuse the code to generate a complete maven command in the publish task instead of using a temp file "MAVEN_CONTEXT"

Release Note

feat(#1656) : Add Jib publish strategy

github-actions · 2023-08-21T16:30:22Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.2% --> 39.0% (Coverage difference: -.2%)

github-actions · 2023-08-21T16:44:10Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.2% --> 39.0% (Coverage difference: -.2%)

squakez · 2023-08-22T06:12:15Z

pkg/util/jib/configuration.go

+	jibPlugin := maven.Plugin{
+		GroupID:    "com.google.cloud.tools",
+		ArtifactID: "jib-maven-plugin",
+		Version:    "3.3.2",


We should have this variable set in the Camel K Runtime BOM instead but I guess can be considered after the draft phase.

Good idea, I would need to see how to make that work. Is it a good idea to do that now as we are moving the runtime code to a possible camel-quarkus extension ?

It does not matter, we can always add that, let's keep for a later dev.

pkg/builder/quarkus.go

pkg/util/jib/configuration.go

github-actions · 2023-08-22T06:48:47Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.2% --> 39.0% (Coverage difference: -.2%)

github-actions · 2023-08-22T06:59:04Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.2% --> 39.0% (Coverage difference: -.2%)

github-actions · 2023-08-22T16:01:19Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.8% (Coverage difference: -.2%)

squakez

In general I think it's okey. There are a few design changes that could make this cleaner if possible.

squakez · 2023-08-23T06:31:49Z

pkg/builder/quarkus.go

@@ -206,6 +207,7 @@ func GenerateQuarkusProjectCommon(runtimeVersion string, quarkusVersion string,
 				},
 			},
 		},
+		jib.JibMavenPlugin(),


We should do this one only when the publish strategy is JIB. However, in general, I think we should leverage the builder profile configuration to have a clean logic separation (ie, the quarkus trait should know nothing about the publishing strategy).

With the proposed approach, you should be able to create a configmap on the fly containing the required configuration for Jib and set to the build accordingly.

pkg/builder/jib.go

squakez · 2023-08-23T06:55:34Z

pkg/util/maven/maven_command.go

@@ -142,7 +142,12 @@ func (c *Command) Do(ctx context.Context) error {

 	Log.WithValues("MAVEN_OPTS", mavenOptions).Infof("executing: %s", strings.Join(cmd.Args, " "))

-	return util.RunAndLog(ctx, cmd, mavenLogHandler, mavenLogHandler)
+	// generate maven file
+	if err := generateMavenContext(c.context.Path, args); err != nil {


I am wondering if, instead of copying the execution config in a file, you could try to regenerate the same at the moment of calling the JIB (ie, creating a func which take care to generate and call it here and later when needed). It would be much cleaner IMO.

It would be better, but I would like to dedicate another issue to this part as it needs a big refactoring in a sensitive part of the build task. It would also be an occasion to see if we can separate the maven code dedicated to commands execution from the project generation code.

github-actions · 2023-08-23T15:04:37Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.8% (Coverage difference: -.2%)

github-actions · 2023-08-24T15:13:43Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.9% (Coverage difference: -.1%)

github-actions · 2023-08-24T15:15:43Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.9% (Coverage difference: -.1%)

gansheer · 2023-08-24T15:20:25Z

I adapted to use a maven profile:

change the builder profile trait to accept multiple values
in case of JIB publish strategy, a configmap containing the default jib profile is created linked to the integration kit

What still needs to be done in this Draft: tests and commits squash

What will be done in later PRs:

extract plugin version in camel-k-runtime
refactor the way we interact with maven to be able to reuse the code to generate a complete maven command in the publish task instead of using a temp file "MAVEN_CONTEXT"

@squakez

github-actions · 2023-08-24T15:23:56Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.9% (Coverage difference: -.1%)

pkg/builder/project.go

github-actions · 2023-08-25T07:30:03Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.9% (Coverage difference: -.1%)

github-actions · 2023-08-25T14:47:31Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.9% (Coverage difference: -.1%)

* Add publish jib strategy compatible with incremental build and native build * Use google jib maven plugin * Use builder maven profiles trait to configure jib plugin * The ConfigMap is created with: * maven jib plugin profile content in profile.xml * kit as an owner * The Jib Profile is used in the Jib published strategy

github-actions · 2023-08-25T15:02:47Z

🐫 Thank you for contributing!

Code Coverage Report ⚠️ - Coverage changed: 39.0% --> 38.9% (Coverage difference: -.1%)

squakez

Excellent work, thanks for contributing to this. I'm going to add some issues to take care of known enhancements later on.

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from ded8201 to c1f28f7 Compare August 21, 2023 16:37

squakez reviewed Aug 22, 2023

View reviewed changes

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from c1f28f7 to f447c9d Compare August 22, 2023 06:41

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from f447c9d to 0b149a1 Compare August 22, 2023 06:52

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 0b149a1 to 3e16b4d Compare August 22, 2023 15:53

squakez reviewed Aug 23, 2023

View reviewed changes

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 3e16b4d to 8cd46a1 Compare August 23, 2023 14:58

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 229dedf to 63cd5d3 Compare August 24, 2023 15:07

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 63cd5d3 to 5e89ebe Compare August 24, 2023 15:15

gansheer requested a review from squakez August 24, 2023 15:21

claudio4j reviewed Aug 25, 2023

View reviewed changes

pkg/builder/project.go Outdated Show resolved Hide resolved

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 5e89ebe to 7588ab2 Compare August 25, 2023 07:23

claudio4j approved these changes Aug 25, 2023

View reviewed changes

Set builder profiles trait as a mutiple value

39885b5

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 7588ab2 to 7035a90 Compare August 25, 2023 14:39

gansheer force-pushed the feature/1656_jib_plugin_strategy branch from 7035a90 to c921652 Compare August 25, 2023 14:55

gansheer marked this pull request as ready for review August 25, 2023 14:58

squakez approved these changes Aug 30, 2023

View reviewed changes

squakez merged commit 0429052 into apache:main Aug 30, 2023

This was referenced Aug 30, 2023

jib builder #1656

Closed

Jib builder strategy enhancements #4703

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(#1656) : Add Jib publish strategy #4680

feat(#1656) : Add Jib publish strategy #4680

gansheer commented Aug 21, 2023 •

edited

Loading

github-actions bot commented Aug 21, 2023

github-actions bot commented Aug 21, 2023

squakez Aug 22, 2023

gansheer Aug 22, 2023

squakez Aug 22, 2023

github-actions bot commented Aug 22, 2023

github-actions bot commented Aug 22, 2023

github-actions bot commented Aug 22, 2023

squakez left a comment

squakez Aug 23, 2023

squakez Aug 23, 2023

squakez Aug 23, 2023

gansheer Aug 23, 2023 •

edited

Loading

github-actions bot commented Aug 23, 2023

github-actions bot commented Aug 24, 2023

github-actions bot commented Aug 24, 2023

gansheer commented Aug 24, 2023 •

edited

Loading

github-actions bot commented Aug 24, 2023

github-actions bot commented Aug 25, 2023

github-actions bot commented Aug 25, 2023

github-actions bot commented Aug 25, 2023

squakez left a comment

feat(#1656) : Add Jib publish strategy #4680

feat(#1656) : Add Jib publish strategy #4680

Conversation

gansheer commented Aug 21, 2023 • edited Loading

github-actions bot commented Aug 21, 2023

github-actions bot commented Aug 21, 2023

squakez Aug 22, 2023

Choose a reason for hiding this comment

gansheer Aug 22, 2023

Choose a reason for hiding this comment

squakez Aug 22, 2023

Choose a reason for hiding this comment

github-actions bot commented Aug 22, 2023

github-actions bot commented Aug 22, 2023

github-actions bot commented Aug 22, 2023

squakez left a comment

Choose a reason for hiding this comment

squakez Aug 23, 2023

Choose a reason for hiding this comment

squakez Aug 23, 2023

Choose a reason for hiding this comment

squakez Aug 23, 2023

Choose a reason for hiding this comment

gansheer Aug 23, 2023 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Aug 23, 2023

github-actions bot commented Aug 24, 2023

github-actions bot commented Aug 24, 2023

gansheer commented Aug 24, 2023 • edited Loading

github-actions bot commented Aug 24, 2023

github-actions bot commented Aug 25, 2023

github-actions bot commented Aug 25, 2023

github-actions bot commented Aug 25, 2023

squakez left a comment

Choose a reason for hiding this comment

gansheer commented Aug 21, 2023 •

edited

Loading

gansheer Aug 23, 2023 •

edited

Loading

gansheer commented Aug 24, 2023 •

edited

Loading