From 2fb8513b3327064f5421827064642307e8fbacb1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 23:46:55 +0000
Subject: [PATCH] chore: nightly automatic updates

---
 CHANGELOG.md                                      | 6 ++++++
 docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 2 +-
 docs/modules/traits/pages/health.adoc             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 262321b7c8..183a5595fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Operator restart Integrations on upgrade [\#5491](https://github.com/apache/camel-k/issues/5491)
 - Remove maven threads configuration based on GOMAXPROCS [\#5467](https://github.com/apache/camel-k/issues/5467)
 - Incorrect content of the build/\_maven\_overlay directory causes the build project failure [\#5466](https://github.com/apache/camel-k/issues/5466)
+- Integration fails to retrieve the publish task and the image digest on OCP [\#5465](https://github.com/apache/camel-k/issues/5465)
 - Make images does not work out of the box [\#5464](https://github.com/apache/camel-k/issues/5464)
 - Generate badges for deprecated traits [\#5424](https://github.com/apache/camel-k/issues/5424)
 - Cannot `make test-smoke` on arm64 out of the box [\#5362](https://github.com/apache/camel-k/issues/5362)
@@ -22,8 +23,13 @@
 **Merged pull requests:**
 
 - \(\#5489\) Use yaml in e2e common [\#5517](https://github.com/apache/camel-k/pull/5517) ([tdiesler](https://github.com/tdiesler))
+- chore\(trait\): revert default health enabled [\#5516](https://github.com/apache/camel-k/pull/5516) ([squakez](https://github.com/squakez))
+- fix\(trait\): environment variables [\#5515](https://github.com/apache/camel-k/pull/5515) ([squakez](https://github.com/squakez))
+- doc: upgrade deployment procedure [\#5514](https://github.com/apache/camel-k/pull/5514) ([squakez](https://github.com/squakez))
+- fix\(ci\): configurable timeouts [\#5512](https://github.com/apache/camel-k/pull/5512) ([squakez](https://github.com/squakez))
 - fix\(e2e\): Route trait schema valid in OCP [\#5506](https://github.com/apache/camel-k/pull/5506) ([gansheer](https://github.com/gansheer))
 - fix\(e2e\): Tekton test permission failure with olm install command [\#5505](https://github.com/apache/camel-k/pull/5505) ([gansheer](https://github.com/gansheer))
+- fix\(tests\): fixed flaky Readiness condition with never ready route test in e2e/common/traits/health\_test.go [\#5503](https://github.com/apache/camel-k/pull/5503) ([valdar](https://github.com/valdar))
 -  Re evaluate golanci-lint exclusions \(execinquery,whitespace,wastedassign,tagliatelle,nolintlint,lll\)" [\#5502](https://github.com/apache/camel-k/pull/5502) ([lburgazzoli](https://github.com/lburgazzoli))
 - feat\(lint\): enabe goconst linter [\#5499](https://github.com/apache/camel-k/pull/5499) ([lburgazzoli](https://github.com/lburgazzoli))
 - \(\#5489\) Groovy \> Yaml [\#5497](https://github.com/apache/camel-k/pull/5497) ([tdiesler](https://github.com/tdiesler))
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 3c28c7f88e..3c66b09875 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -6970,7 +6970,7 @@ Deprecated: to be removed from trait configuration.
 
 The health trait is responsible for configuring the health probes on the integration container.
 
-NOTE: this trait is enabled by default.
+NOTE: this trait is disabled by default.
 
 
 [cols="2,2a",options="header"]
diff --git a/docs/modules/traits/pages/health.adoc b/docs/modules/traits/pages/health.adoc
index d6c4a1087b..c536563383 100755
--- a/docs/modules/traits/pages/health.adoc
+++ b/docs/modules/traits/pages/health.adoc
@@ -5,7 +5,7 @@
 // Start of autogenerated code - DO NOT EDIT! (description)
 The health trait is responsible for configuring the health probes on the integration container.
 
-NOTE: this trait is enabled by default.
+NOTE: this trait is disabled by default.
 
 
 This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**.