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.

Sign up for GitHub

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

[Backport 2.3.x] fix(trait): camel catalog regression #5525

Merged
merged 4 commits into from
May 21, 2024
Merged

[Backport 2.3.x] fix(trait): camel catalog regression #5525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d325ea
fix(traits): knative service for synthetic kits
squakez May 20, 2024
34743e0
fix(traits): knative for synthetic kits
squakez May 20, 2024
a570170
fix(trait): health for synthetic Kits
squakez May 20, 2024
d2b5d8c
fix(traits): logging for synthetic kits
squakez May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6980,6 +6980,13 @@ int32

Minimum consecutive failures for the liveness probe to be considered failed after having succeeded.

|`livenessProbe` +
string
|


The liveness probe path to use (default provided by the Catalog runtime used).

|`readinessProbeEnabled` +
bool
|
Expand Down Expand Up @@ -7029,6 +7036,13 @@ int32

Minimum consecutive failures for the readiness probe to be considered failed after having succeeded.

|`readinessProbe` +
string
|


The readiness probe path to use (default provided by the Catalog runtime used).

|`startupProbeEnabled` +
bool
|
Expand Down Expand Up @@ -7078,6 +7092,13 @@ int32

Minimum consecutive failures for the startup probe to be considered failed after having succeeded.

|`startupProbe` +
string
|


The startup probe path to use (default provided by the Catalog runtime used).


|===

Expand Down
12 changes: 12 additions & 0 deletions docs/modules/traits/pages/health.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ The following configuration options are available:
| int32
| Minimum consecutive failures for the liveness probe to be considered failed after having succeeded.

| health.liveness-probe
| string
| The liveness probe path to use (default provided by the Catalog runtime used).

| health.readiness-probe-enabled
| bool
| Configures the readiness probe for the integration container (default `true`).
Expand Down Expand Up @@ -83,6 +87,10 @@ The following configuration options are available:
| int32
| Minimum consecutive failures for the readiness probe to be considered failed after having succeeded.

| health.readiness-probe
| string
| The readiness probe path to use (default provided by the Catalog runtime used).

| health.startup-probe-enabled
| bool
| Configures the startup probe for the integration container (default `false`).
Expand Down Expand Up @@ -111,6 +119,10 @@ The following configuration options are available:
| int32
| Minimum consecutive failures for the startup probe to be considered failed after having succeeded.

| health.startup-probe
| string
| The startup probe path to use (default provided by the Catalog runtime used).

|===

// End of autogenerated code - DO NOT EDIT! (configuration)
24 changes: 24 additions & 0 deletions helm/camel-k/crds/crd-integration-platform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -1024,6 +1028,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -1056,6 +1064,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down Expand Up @@ -2903,6 +2915,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -2935,6 +2951,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -2967,6 +2987,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down
24 changes: 24 additions & 0 deletions helm/camel-k/crds/crd-integration-profile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -901,6 +905,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -933,6 +941,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down Expand Up @@ -2663,6 +2675,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -2695,6 +2711,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -2727,6 +2747,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down
12 changes: 12 additions & 0 deletions helm/camel-k/crds/crd-integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6888,6 +6888,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -6920,6 +6924,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -6952,6 +6960,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down
12 changes: 12 additions & 0 deletions helm/camel-k/crds/crd-kamelet-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7176,6 +7176,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -7208,6 +7212,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default
provided by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -7240,6 +7248,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down
12 changes: 12 additions & 0 deletions helm/camel-k/crds/crd-pipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7174,6 +7174,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -7206,6 +7210,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default
provided by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -7238,6 +7246,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/camel/v1/trait/health.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ type HealthTrait struct {
LivenessSuccessThreshold int32 `property:"liveness-success-threshold" json:"livenessSuccessThreshold,omitempty"`
// Minimum consecutive failures for the liveness probe to be considered failed after having succeeded.
LivenessFailureThreshold int32 `property:"liveness-failure-threshold" json:"livenessFailureThreshold,omitempty"`
// The liveness probe path to use (default provided by the Catalog runtime used).
LivenessProbe string `property:"liveness-probe" json:"livenessProbe,omitempty"`

// Configures the readiness probe for the integration container (default `true`).
ReadinessProbeEnabled *bool `property:"readiness-probe-enabled" json:"readinessProbeEnabled,omitempty"`
Expand All @@ -54,6 +56,8 @@ type HealthTrait struct {
ReadinessSuccessThreshold int32 `property:"readiness-success-threshold" json:"readinessSuccessThreshold,omitempty"`
// Minimum consecutive failures for the readiness probe to be considered failed after having succeeded.
ReadinessFailureThreshold int32 `property:"readiness-failure-threshold" json:"readinessFailureThreshold,omitempty"`
// The readiness probe path to use (default provided by the Catalog runtime used).
ReadinessProbe string `property:"readiness-probe" json:"readinessProbe,omitempty"`

// Configures the startup probe for the integration container (default `false`).
StartupProbeEnabled *bool `property:"startup-probe-enabled" json:"startupProbeEnabled,omitempty"`
Expand All @@ -69,4 +73,6 @@ type HealthTrait struct {
StartupSuccessThreshold int32 `property:"startup-success-threshold" json:"startupSuccessThreshold,omitempty"`
// Minimum consecutive failures for the startup probe to be considered failed after having succeeded.
StartupFailureThreshold int32 `property:"startup-failure-threshold" json:"startupFailureThreshold,omitempty"`
// The startup probe path to use (default provided by the Catalog runtime used).
StartupProbe string `property:"startup-probe" json:"startupProbe,omitempty"`
}
24 changes: 24 additions & 0 deletions pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -1024,6 +1028,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -1056,6 +1064,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down Expand Up @@ -2903,6 +2915,10 @@ spec:
description: How often to perform the liveness probe.
format: int32
type: integer
livenessProbe:
description: The liveness probe path to use (default provided
by the Catalog runtime used).
type: string
livenessProbeEnabled:
description: Configures the liveness probe for the integration
container (default `false`).
Expand Down Expand Up @@ -2935,6 +2951,10 @@ spec:
description: How often to perform the readiness probe.
format: int32
type: integer
readinessProbe:
description: The readiness probe path to use (default provided
by the Catalog runtime used).
type: string
readinessProbeEnabled:
description: Configures the readiness probe for the integration
container (default `true`).
Expand Down Expand Up @@ -2967,6 +2987,10 @@ spec:
description: How often to perform the startup probe.
format: int32
type: integer
startupProbe:
description: The startup probe path to use (default provided
by the Catalog runtime used).
type: string
startupProbeEnabled:
description: Configures the startup probe for the integration
container (default `false`).
Expand Down
Loading
Loading