You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/10/11 10:30:20 UTC
[camel-k] branch main updated (ee6b4ef6f -> 35978dc94)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from ee6b4ef6f chore: nightly SBOM update
new 873e0fd31 feat(trait): quarkus native advanced configuration
new 35978dc94 chore: quarkus doc updated
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../bases/camel.apache.org_integrationkits.yaml | 9 +++++++
.../camel.apache.org_integrationplatforms.yaml | 18 +++++++++++++
.../crd/bases/camel.apache.org_integrations.yaml | 9 +++++++
.../bases/camel.apache.org_kameletbindings.yaml | 9 +++++++
config/crd/bases/camel.apache.org_pipes.yaml | 9 +++++++
.../ROOT/pages/installation/advanced/network.adoc | 2 +-
.../ROOT/pages/installation/advanced/offline.adoc | 4 +--
.../modules/ROOT/pages/running/quarkus-native.adoc | 30 ++++++++++++++++++++--
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 14 ++++++++++
docs/modules/traits/pages/quarkus.adoc | 25 ++++++------------
helm/camel-k/crds/crd-integration-kit.yaml | 9 +++++++
helm/camel-k/crds/crd-integration-platform.yaml | 18 +++++++++++++
helm/camel-k/crds/crd-integration.yaml | 9 +++++++
helm/camel-k/crds/crd-kamelet-binding.yaml | 9 +++++++
helm/camel-k/crds/crd-pipe.yaml | 9 +++++++
pkg/apis/camel/v1/trait/quarkus.go | 4 +++
pkg/builder/image.go | 3 ---
pkg/trait/builder.go | 8 ++++--
pkg/trait/quarkus.go | 11 ++++++--
resources/traits.yaml | 7 +++++
20 files changed, 187 insertions(+), 29 deletions(-)
[camel-k] 01/02: feat(trait): quarkus native advanced configuration
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 873e0fd312e14acb29e78d039839fd0a51c5c02d
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Oct 10 13:30:53 2023 +0200
feat(trait): quarkus native advanced configuration
Closes #4756
---
config/crd/bases/camel.apache.org_integrationkits.yaml | 9 +++++++++
.../bases/camel.apache.org_integrationplatforms.yaml | 18 ++++++++++++++++++
config/crd/bases/camel.apache.org_integrations.yaml | 9 +++++++++
config/crd/bases/camel.apache.org_kameletbindings.yaml | 9 +++++++++
config/crd/bases/camel.apache.org_pipes.yaml | 9 +++++++++
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 14 ++++++++++++++
docs/modules/traits/pages/quarkus.adoc | 8 ++++++++
helm/camel-k/crds/crd-integration-kit.yaml | 9 +++++++++
helm/camel-k/crds/crd-integration-platform.yaml | 18 ++++++++++++++++++
helm/camel-k/crds/crd-integration.yaml | 9 +++++++++
helm/camel-k/crds/crd-kamelet-binding.yaml | 9 +++++++++
helm/camel-k/crds/crd-pipe.yaml | 9 +++++++++
pkg/apis/camel/v1/trait/quarkus.go | 4 ++++
pkg/builder/image.go | 2 +-
pkg/resources/resources.go | 17 +++++++++++++++++
pkg/trait/builder.go | 8 ++++++--
pkg/trait/quarkus.go | 5 +++++
resources/traits.yaml | 7 +++++++
18 files changed, 170 insertions(+), 3 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml
index 2a42beee8..5c282381b 100644
--- a/config/crd/bases/camel.apache.org_integrationkits.yaml
+++ b/config/crd/bases/camel.apache.org_integrationkits.yaml
@@ -335,6 +335,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index 0f473b801..50f8854b8 100644
--- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -1628,6 +1628,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
@@ -3441,6 +3450,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml
index 9688a46a1..5589263a2 100644
--- a/config/crd/bases/camel.apache.org_integrations.yaml
+++ b/config/crd/bases/camel.apache.org_integrations.yaml
@@ -7545,6 +7545,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index 2f5ff7497..5f5f20eea 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -7842,6 +7842,15 @@ spec:
description: Can be used to enable or disable a trait.
All traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native
+ build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required
+ for a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or
`native` (default `fast-jar`). In case both `fast-jar`
diff --git a/config/crd/bases/camel.apache.org_pipes.yaml b/config/crd/bases/camel.apache.org_pipes.yaml
index c8c5b8ea8..793ba658f 100644
--- a/config/crd/bases/camel.apache.org_pipes.yaml
+++ b/config/crd/bases/camel.apache.org_pipes.yaml
@@ -7840,6 +7840,15 @@ spec:
description: Can be used to enable or disable a trait.
All traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native
+ build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required
+ for a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or
`native` (default `fast-jar`). In case both `fast-jar`
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index a9070f7c7..9b6408d5b 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -7652,6 +7652,20 @@ The Quarkus mode to run: either `jvm` or `native` (default `jvm`).
In case both `jvm` and `native` are specified, two `IntegrationKit` resources are created,
with the `native` kit having precedence over the `jvm` one once ready.
+|`nativeBaseImage` +
+string
+|
+
+
+The base image to use when running a native build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+
+|`nativeBuilderImage` +
+string
+|
+
+
+The image containing the tooling required for a native build (by default it will use the one provided in the runtime catalog)
+
|===
diff --git a/docs/modules/traits/pages/quarkus.adoc b/docs/modules/traits/pages/quarkus.adoc
index 77a7ce021..32ce062c9 100755
--- a/docs/modules/traits/pages/quarkus.adoc
+++ b/docs/modules/traits/pages/quarkus.adoc
@@ -49,6 +49,14 @@ Deprecated: use `build-mode` instead.
In case both `jvm` and `native` are specified, two `IntegrationKit` resources are created,
with the `native` kit having precedence over the `jvm` one once ready.
+| quarkus.native-base-image
+| string
+| The base image to use when running a native build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+
+| quarkus.native-builder-image
+| string
+| The image containing the tooling required for a native build (by default it will use the one provided in the runtime catalog)
+
|===
// End of autogenerated code - DO NOT EDIT! (configuration)
diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml
index 2a42beee8..5c282381b 100644
--- a/helm/camel-k/crds/crd-integration-kit.yaml
+++ b/helm/camel-k/crds/crd-integration-kit.yaml
@@ -335,6 +335,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml
index 0f473b801..50f8854b8 100644
--- a/helm/camel-k/crds/crd-integration-platform.yaml
+++ b/helm/camel-k/crds/crd-integration-platform.yaml
@@ -1628,6 +1628,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
@@ -3441,6 +3450,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
index 9688a46a1..5589263a2 100644
--- a/helm/camel-k/crds/crd-integration.yaml
+++ b/helm/camel-k/crds/crd-integration.yaml
@@ -7545,6 +7545,15 @@ spec:
description: Can be used to enable or disable a trait. All
traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native build
+ (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required for
+ a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or `native`
(default `fast-jar`). In case both `fast-jar` and `native`
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index 2f5ff7497..5f5f20eea 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -7842,6 +7842,15 @@ spec:
description: Can be used to enable or disable a trait.
All traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native
+ build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required
+ for a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or
`native` (default `fast-jar`). In case both `fast-jar`
diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml
index c8c5b8ea8..793ba658f 100644
--- a/helm/camel-k/crds/crd-pipe.yaml
+++ b/helm/camel-k/crds/crd-pipe.yaml
@@ -7840,6 +7840,15 @@ spec:
description: Can be used to enable or disable a trait.
All traits share this common property.
type: boolean
+ nativeBaseImage:
+ description: The base image to use when running a native
+ build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ type: string
+ nativeBuilderImage:
+ description: The image containing the tooling required
+ for a native build (by default it will use the one provided
+ in the runtime catalog)
+ type: string
packageTypes:
description: 'The Quarkus package types, `fast-jar` or
`native` (default `fast-jar`). In case both `fast-jar`
diff --git a/pkg/apis/camel/v1/trait/quarkus.go b/pkg/apis/camel/v1/trait/quarkus.go
index 823bfa10b..5bd2cd74d 100644
--- a/pkg/apis/camel/v1/trait/quarkus.go
+++ b/pkg/apis/camel/v1/trait/quarkus.go
@@ -40,6 +40,10 @@ type QuarkusTrait struct {
// In case both `jvm` and `native` are specified, two `IntegrationKit` resources are created,
// with the `native` kit having precedence over the `jvm` one once ready.
Modes []QuarkusMode `property:"build-mode" json:"buildMode,omitempty"`
+ // The base image to use when running a native build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ NativeBaseImage string `property:"native-base-image" json:"nativeBaseImage,omitempty"`
+ // The image containing the tooling required for a native build (by default it will use the one provided in the runtime catalog)
+ NativeBuilderImage string `property:"native-builder-image" json:"nativeBuilderImage,omitempty"`
}
// QuarkusMode is the type of Quarkus build packaging.
diff --git a/pkg/builder/image.go b/pkg/builder/image.go
index 9a7ba1bd0..e88b60aee 100644
--- a/pkg/builder/image.go
+++ b/pkg/builder/image.go
@@ -65,7 +65,7 @@ func nativeImageContext(ctx *builderContext) error {
return imageContext(ctx, func(ctx *builderContext) error {
runner := "camel-k-integration-" + defaults.Version + "-runner"
- ctx.BaseImage = "quay.io/quarkus/quarkus-distroless-image:1.0"
+ //ctx.BaseImage = "quay.io/quarkus/quarkus-distroless-image:1.0"
ctx.Artifacts = []v1.Artifact{
{
ID: runner,
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index f4c3f686d..e8d997d8c 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -174,6 +174,18 @@ var assets = func() http.FileSystem {
name: "manager",
modTime: time.Time{},
},
+ "/manager/bundle": &vfsgen۰DirInfo{
+ name: "bundle",
+ modTime: time.Time{},
+ },
+ "/manager/bundle/manifests": &vfsgen۰DirInfo{
+ name: "manifests",
+ modTime: time.Time{},
+ },
+ "/manager/bundle/metadata": &vfsgen۰DirInfo{
+ name: "metadata",
+ modTime: time.Time{},
+ },
"/manager/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{
name: "operator-deployment.yaml",
modTime: time.Time{},
@@ -672,6 +684,7 @@ var assets = func() http.FileSystem {
fs["/crd/bases/camel.apache.org_pipes.yaml"].(os.FileInfo),
}
fs["/manager"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
+ fs["/manager/bundle"].(os.FileInfo),
fs["/manager/operator-deployment.yaml"].(os.FileInfo),
fs["/manager/operator-service-account.yaml"].(os.FileInfo),
fs["/manager/patch-image-pull-policy-always.yaml"].(os.FileInfo),
@@ -683,6 +696,10 @@ var assets = func() http.FileSystem {
fs["/manager/patch-toleration.yaml"].(os.FileInfo),
fs["/manager/patch-watch-namespace-global.yaml"].(os.FileInfo),
}
+ fs["/manager/bundle"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
+ fs["/manager/bundle/manifests"].(os.FileInfo),
+ fs["/manager/bundle/metadata"].(os.FileInfo),
+ }
fs["/prometheus"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/prometheus/operator-pod-monitor.yaml"].(os.FileInfo),
fs["/prometheus/operator-prometheus-rule.yaml"].(os.FileInfo),
diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go
index 805ba37ef..82ba4ebcb 100644
--- a/pkg/trait/builder.go
+++ b/pkg/trait/builder.go
@@ -80,9 +80,13 @@ func (t *builderTrait) Configure(e *Environment) (bool, error) {
if ok && pointer.BoolDeref(quarkus.Enabled, true) && (isNativeIntegration || isNativeKit) {
// TODO expect maven repository in local repo (need to change builder pod accordingly!)
command := builder.QuarkusRuntimeSupport(e.CamelCatalog.GetCamelQuarkusVersion()).BuildCommands()
-
+ nativeBuilderImage := quarkus.NativeBuilderImage
+ if nativeBuilderImage == "" {
+ // default from the catalog
+ nativeBuilderImage = e.CamelCatalog.GetQuarkusToolingImage()
+ }
// it should be performed as the last custom task
- t.Tasks = append(t.Tasks, fmt.Sprintf(`quarkus-native;%s;/bin/bash -c "%s"`, e.CamelCatalog.GetQuarkusToolingImage(), command))
+ t.Tasks = append(t.Tasks, fmt.Sprintf(`quarkus-native;%s;/bin/bash -c "%s"`, nativeBuilderImage, command))
// Force the build to run in a separate Pod and strictly sequential
t.L.Info("This is a Quarkus native build: setting build configuration with build Pod strategy, and native container with 1 CPU core and 4 GiB memory. Make sure your cluster can handle it.")
t.Strategy = string(v1.BuildStrategyPod)
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index ad3744d8e..e5dde154d 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -347,6 +347,11 @@ func (t *quarkusTrait) applyWhenBuildSubmitted(e *Environment) error {
if native {
if nativePackagetType := builder.QuarkusRuntimeSupport(e.CamelCatalog.GetCamelQuarkusVersion()).NativeMavenProperty(); nativePackagetType != "" {
buildTask.Maven.Properties["quarkus.package.type"] = nativePackagetType
+ if t.NativeBaseImage == "" {
+ packageTask.BaseImage = "quay.io/quarkus/quarkus-micro-image:2.0"
+ } else {
+ packageTask.BaseImage = t.NativeBaseImage
+ }
}
if len(e.IntegrationKit.Spec.Sources) > 0 {
buildTask.Sources = e.IntegrationKit.Spec.Sources
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 7484e147e..8b711afbc 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -1381,6 +1381,13 @@ traits:
In case both `jvm` and `native` are specified, two `IntegrationKit` resources
are created, with the `native` kit having precedence over the `jvm` one once
ready.'
+ - name: native-base-image
+ type: string
+ description: The base image to use when running a native build (default `quay.io/quarkus/quarkus-micro-image:2.0`)
+ - name: native-builder-image
+ type: string
+ description: The image containing the tooling required for a native build (by
+ default it will use the one provided in the runtime catalog)
- name: registry
platform: false
profiles:
[camel-k] 02/02: chore: quarkus doc updated
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 35978dc94d677258351f1362cc707874613443f4
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Oct 10 17:12:31 2023 +0200
chore: quarkus doc updated
---
.../ROOT/pages/installation/advanced/network.adoc | 2 +-
.../ROOT/pages/installation/advanced/offline.adoc | 4 +--
.../modules/ROOT/pages/running/quarkus-native.adoc | 30 ++++++++++++++++++++--
docs/modules/traits/pages/quarkus.adoc | 17 ------------
pkg/builder/image.go | 3 ---
pkg/resources/resources.go | 17 ------------
pkg/trait/quarkus.go | 8 +++---
7 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/docs/modules/ROOT/pages/installation/advanced/network.adoc b/docs/modules/ROOT/pages/installation/advanced/network.adoc
index ba251bc34..0c54e29ce 100644
--- a/docs/modules/ROOT/pages/installation/advanced/network.adoc
+++ b/docs/modules/ROOT/pages/installation/advanced/network.adoc
@@ -34,4 +34,4 @@ In particular the access will be required when the operator build the builder co
Also in this case, the longer the operator runs, the lower the need to access to the base images, since they will be already cached and the higher the possibility to use incremental image from other IntegrationKits created.
-NOTE: at the moment of writing, the default builder image we use is _quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.2.0.0-Final-java11_ and the default integration image is _eclipse-temurin:17_
\ No newline at end of file
+NOTE: at the moment of writing, the default builder image we use is _quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17_ and the default integration image is _eclipse-temurin:17_
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/installation/advanced/offline.adoc b/docs/modules/ROOT/pages/installation/advanced/offline.adoc
index 98d312d41..6edf96e65 100644
--- a/docs/modules/ROOT/pages/installation/advanced/offline.adoc
+++ b/docs/modules/ROOT/pages/installation/advanced/offline.adoc
@@ -17,9 +17,9 @@ As we're in a disconnected environment, we assume this component to be accessibl
We cannot provide any specific guideline on how to preload images in the cluster registry (as it vary on your infrastructure). However we expect this to be part of the documentation of the cluster in a disconnected mode. At the same manner, you'll need to make sure to include the following images which will be required by Camel K during its operations:
-* `quay.io/quarkus/quarkus-distroless-image:1.0`
+* `quay.io/quarkus/quarkus-micro-image:2.0`
* `eclipse-temurin:17` (or any other base image you want to use)
-* `quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.2.0.0-Final-java11`
+* `quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17`
The last one is the image used in the Camel K Runtime 2.16.0 version (the default one at the time of writing). Make sure to identify in the catalog (`.spec.runtime.metadata.quarkus.native-builder-image`) the one required in your installation.
diff --git a/docs/modules/ROOT/pages/running/quarkus-native.adoc b/docs/modules/ROOT/pages/running/quarkus-native.adoc
index 59a61546e..323c210dd 100644
--- a/docs/modules/ROOT/pages/running/quarkus-native.adoc
+++ b/docs/modules/ROOT/pages/running/quarkus-native.adoc
@@ -1,7 +1,33 @@
= Run Quarkus native applications
-The default Camel runtime used by Camel K is Camel Quarkus (via Camel K Runtime dependency). This is a great choice for cloud development and by default we use the JVM mode which provides already enough optimization which makes Camel applications, first class Cloud Native applications.
+The default Camel runtime used by Camel K is Camel Quarkus (via Camel K Runtime dependency). This is a great choice for **cloud native development** and by default we use the JVM mode which provides already enough optimization which makes Camel applications, first class cloud native applications.
Quarkus (and Camel Quarkus) offers also the possibility to perform a build ahead of time (AOT) and have even further optimization, making your Camel application a native executable with very low footprint and immediate startup. This is known as Native mode and we can configure such behavior using the xref:traits:quarkus.adoc[Quarkus trait].
-See the examples provided in xref:traits:quarkus.adoc#_automatic_rollout_deployment_to_native_integration[Quarkus trait] documentation page to learn how to use the feature.
\ No newline at end of file
+== Quarkus JVM mode
+
+This is the default. As the default Camel K runtime is Quarkus, then, every Camel application you run in Kubernetes are already optimized with Quarkus JVM mode.
+
+== Quarkus native
+
+If you want to go Quarkus native, then you need to familiarize with the xref:traits:quarkus.adoc[Quarkus trait]. This trait is used to configure any aspect related to Quarkus build. The most straightforward way is to use `quarkus.build-mode=native` parameter:
+
+[source,console]
+$ kamel run quarkus.build-mode=native ...
+
+This one will trigger a native compilation on your cluster. Mind that a native compilation require quite certain amount of memory and specific tooling (GraalVM). For this reason, any native build will be forced to execute with `pod` build strategy, meaning that a new Kubernetes Pod is scheduled to perform such operation. We calculate certain sensible values for Kubernetes resource such as memory and CPU (4Gi and 1000 millicores). However, depending on the complexity of your Camel applica [...]
+
+=== Automatic Rollout Deployment to Native Integration
+
+Compilation to native executables produces integrations that start faster and consume less memory at runtime. However the build process is resources intensive and takes a longer time than the packaging of a JVM mode application.
+
+In order to combine the best of both worlds, it's possible to configure the Quarkus trait to run both traditional and native builds in parallel when running an integration, e.g.:
+
+[source,console]
+$ kamel run -t quarkus.build-mode=jvm -t quarkus.build-mode=native ...
+
+The Integration pod will run as soon as the `jvm` build completes (within seconds), and a rollout deployment to the `native` image will be triggered, as soon as the `native` build completes (within minutes), with no service interruption.
+
+== Supported Camel Components
+
+Camel K only supports the Camel components that are available as Camel Quarkus Extensions out-of-the-box. These extensions are listed in the xref:camel-quarkus::reference/index.adoc[Camel Quarkus documentation].
diff --git a/docs/modules/traits/pages/quarkus.adoc b/docs/modules/traits/pages/quarkus.adoc
index 32ce062c9..0fbf5a19f 100755
--- a/docs/modules/traits/pages/quarkus.adoc
+++ b/docs/modules/traits/pages/quarkus.adoc
@@ -60,20 +60,3 @@ with the `native` kit having precedence over the `jvm` one once ready.
|===
// End of autogenerated code - DO NOT EDIT! (configuration)
-
-== Supported Camel Components
-
-Camel K only supports the Camel components that are available as Camel Quarkus Extensions out-of-the-box. These extensions are listed in the xref:camel-quarkus::reference/index.adoc[Camel Quarkus documentation].
-
-== Examples
-
-=== Automatic Rollout Deployment to Native Integration
-
-While the compilation to native executables produces integrations that start faster and consume less memory at runtime, the build process is resources intensive, and takes a longer time than the packaging to traditional Java applications.
-
-In order to combine the best of both worlds, it's possible to configure the Quarkus trait to run both traditional and native builds in parallel when running an integration, e.g.:
-
-[source,console]
-$ kamel run -t quarkus.mode=jvm -t quarkus.mode=native ...
-
-The Integration pod will run as soon as the `hvm` build completes, and a rollout deployment to the `native` image will be triggered, as soon as the `native` build completes, with no service interruption.
diff --git a/pkg/builder/image.go b/pkg/builder/image.go
index e88b60aee..5def5a525 100644
--- a/pkg/builder/image.go
+++ b/pkg/builder/image.go
@@ -64,8 +64,6 @@ type artifactsSelector func(ctx *builderContext) error
func nativeImageContext(ctx *builderContext) error {
return imageContext(ctx, func(ctx *builderContext) error {
runner := "camel-k-integration-" + defaults.Version + "-runner"
-
- //ctx.BaseImage = "quay.io/quarkus/quarkus-distroless-image:1.0"
ctx.Artifacts = []v1.Artifact{
{
ID: runner,
@@ -74,7 +72,6 @@ func nativeImageContext(ctx *builderContext) error {
},
}
ctx.SelectedArtifacts = ctx.Artifacts
-
return nil
})
}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index e8d997d8c..f4c3f686d 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -174,18 +174,6 @@ var assets = func() http.FileSystem {
name: "manager",
modTime: time.Time{},
},
- "/manager/bundle": &vfsgen۰DirInfo{
- name: "bundle",
- modTime: time.Time{},
- },
- "/manager/bundle/manifests": &vfsgen۰DirInfo{
- name: "manifests",
- modTime: time.Time{},
- },
- "/manager/bundle/metadata": &vfsgen۰DirInfo{
- name: "metadata",
- modTime: time.Time{},
- },
"/manager/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{
name: "operator-deployment.yaml",
modTime: time.Time{},
@@ -684,7 +672,6 @@ var assets = func() http.FileSystem {
fs["/crd/bases/camel.apache.org_pipes.yaml"].(os.FileInfo),
}
fs["/manager"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
- fs["/manager/bundle"].(os.FileInfo),
fs["/manager/operator-deployment.yaml"].(os.FileInfo),
fs["/manager/operator-service-account.yaml"].(os.FileInfo),
fs["/manager/patch-image-pull-policy-always.yaml"].(os.FileInfo),
@@ -696,10 +683,6 @@ var assets = func() http.FileSystem {
fs["/manager/patch-toleration.yaml"].(os.FileInfo),
fs["/manager/patch-watch-namespace-global.yaml"].(os.FileInfo),
}
- fs["/manager/bundle"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
- fs["/manager/bundle/manifests"].(os.FileInfo),
- fs["/manager/bundle/metadata"].(os.FileInfo),
- }
fs["/prometheus"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/prometheus/operator-pod-monitor.yaml"].(os.FileInfo),
fs["/prometheus/operator-prometheus-rule.yaml"].(os.FileInfo),
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index e5dde154d..c1fd3cdac 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -37,6 +37,8 @@ import (
const (
quarkusTraitID = "quarkus"
+
+ QuarkusNativeDefaultBaseImageName = "quay.io/quarkus/quarkus-micro-image:2.0"
)
type quarkusPackageType string
@@ -345,10 +347,10 @@ func (t *quarkusTrait) applyWhenBuildSubmitted(e *Environment) error {
packageSteps = append(packageSteps, builder.Quarkus.LoadCamelQuarkusCatalog)
if native {
- if nativePackagetType := builder.QuarkusRuntimeSupport(e.CamelCatalog.GetCamelQuarkusVersion()).NativeMavenProperty(); nativePackagetType != "" {
- buildTask.Maven.Properties["quarkus.package.type"] = nativePackagetType
+ if nativePackageType := builder.QuarkusRuntimeSupport(e.CamelCatalog.GetCamelQuarkusVersion()).NativeMavenProperty(); nativePackageType != "" {
+ buildTask.Maven.Properties["quarkus.package.type"] = nativePackageType
if t.NativeBaseImage == "" {
- packageTask.BaseImage = "quay.io/quarkus/quarkus-micro-image:2.0"
+ packageTask.BaseImage = QuarkusNativeDefaultBaseImageName
} else {
packageTask.BaseImage = t.NativeBaseImage
}