Skip to content

Commit

Permalink
fix(trait): health for synthetic Kits
Browse files Browse the repository at this point in the history
Ref #5519
  • Loading branch information
squakez committed May 20, 2024
1 parent 0eab021 commit c5f07cd
Show file tree
Hide file tree
Showing 15 changed files with 284 additions and 28 deletions.
21 changes: 21 additions & 0 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7034,6 +7034,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 @@ -7083,6 +7090,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 @@ -7132,6 +7146,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
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,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 @@ -85,6 +89,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 @@ -113,6 +121,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
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,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 @@ -1062,6 +1066,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 @@ -1094,6 +1102,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 @@ -3008,6 +3020,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 @@ -3040,6 +3056,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 @@ -3072,6 +3092,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
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,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 @@ -939,6 +943,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 @@ -971,6 +979,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 @@ -2768,6 +2780,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 @@ -2800,6 +2816,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 @@ -2832,6 +2852,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
Original file line number Diff line number Diff line change
Expand Up @@ -6968,6 +6968,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 @@ -7000,6 +7004,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 @@ -7032,6 +7040,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
Original file line number Diff line number Diff line change
Expand Up @@ -7251,6 +7251,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 @@ -7283,6 +7287,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 @@ -7315,6 +7323,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
Original file line number Diff line number Diff line change
Expand Up @@ -7249,6 +7249,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 @@ -7281,6 +7285,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 @@ -7313,6 +7321,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
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"`
}
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,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 @@ -1062,6 +1066,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 @@ -1094,6 +1102,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 @@ -3008,6 +3020,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 @@ -3040,6 +3056,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 @@ -3072,6 +3092,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

0 comments on commit c5f07cd

Please sign in to comment.