Skip to content

Commit

Permalink
rename to observabilityTimeout
Browse files Browse the repository at this point in the history
Signed-off-by: odubajDT <[email protected]>
  • Loading branch information
odubajDT committed Feb 29, 2024
1 parent ec9075e commit e2d83f2
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 44 deletions.
16 changes: 8 additions & 8 deletions .github/scripts/.helm-tests/default/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2050,20 +2050,20 @@ spec:
description: CloudEventsEndpoint can be used to set the endpoint where
Cloud Events should be posted by the lifecycle operator
type: string
deploymentTimeout:
default: 5m
description: |-
DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
keptnAppCreationRequestTimeoutSeconds:
default: 30
description: |-
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
observabilityTimeout:
default: 5m
description: |-
ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
type: object
status:
description: unused field
Expand Down
16 changes: 8 additions & 8 deletions .github/scripts/.helm-tests/lifecycle-only/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1996,20 +1996,20 @@ spec:
description: CloudEventsEndpoint can be used to set the endpoint where
Cloud Events should be posted by the lifecycle operator
type: string
deploymentTimeout:
default: 5m
description: |-
DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
keptnAppCreationRequestTimeoutSeconds:
default: 30
description: |-
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
observabilityTimeout:
default: 5m
description: |-
ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
type: object
status:
description: unused field
Expand Down
16 changes: 8 additions & 8 deletions .github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2025,20 +2025,20 @@ spec:
description: CloudEventsEndpoint can be used to set the endpoint where
Cloud Events should be posted by the lifecycle operator
type: string
deploymentTimeout:
default: 5m
description: |-
DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
keptnAppCreationRequestTimeoutSeconds:
default: 30
description: |-
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
observabilityTimeout:
default: 5m
description: |-
ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
type: object
status:
description: unused field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ _Appears in:_
| `keptnAppCreationRequestTimeoutSeconds` _integer_ | KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery searches for workload to put into the same auto-generated KeptnApp |30||
| `cloudEventsEndpoint` _string_ | CloudEventsEndpoint can be used to set the endpoint where Cloud Events should be posted by the lifecycle operator |||
| `blockDeployment` _boolean_ | BlockDeployment is used to block the deployment of the application until the pre-deployment tasks and evaluations succeed |true||
| `deploymentTimeout` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#duration-v1-meta)_ | DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state. If the workload does not deploy successfully within this time frame, it will be considered as failed. |5m||
| `observabilityTimeout` _[Duration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#duration-v1-meta)_ | ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload. If the workload does not deploy successfully within this time frame, it will be considered as failed. |5m||


9 changes: 9 additions & 0 deletions docs/docs/reference/crd-reference/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
keptnAppCreationRequestTimeoutSeconds: <#-seconds>
cloudEventsEndpoint: <endpoint>
blockDeployment: true | false
observabilityTimeout: <duration>
```
## Fields
Expand Down Expand Up @@ -48,6 +49,13 @@ spec:
even if the pre-deployment tasks and/or evaluations fail.
For more information see the
[non-blocking deployment section](../../components/lifecycle-operator/keptn-non-blocking.md).
* **observabilityTimeout** -- specifies the maximum time
to observe the deployment phase of
[KeptnWorkload](../api-reference/lifecycle/v1beta1/index.md).
The value supplied should specify the unit of measurement;
for example, `5m` indicates 5 minutes and `1h` indicates 1 hour.
If the workload is not deployed successfully within this time frame,
it is considered to be failed.

## Usage

Expand All @@ -73,6 +81,7 @@ spec:
keptnAppCreationRequestTimeoutSeconds: 40
cloudEventsEndpoint: 'http://endpoint.com'
blockDeployment: false
observabilityTimeout: 10m
```

## Files
Expand Down
4 changes: 2 additions & 2 deletions lifecycle-operator/apis/options/v1alpha1/keptnconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ type KeptnConfigSpec struct {
// +optional
BlockDeployment bool `json:"blockDeployment,omitempty"`

// DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state.
// ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
// If the workload does not deploy successfully within this time frame, it will be
// considered as failed.
// +kubebuilder:default:="5m"
// +kubebuilder:validation:Pattern="^0|([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
// +kubebuilder:validation:Type:=string
// +optional
DeploymentTimeout metav1.Duration `json:"deploymentTimeout,omitempty"`
ObservabilityTimeout metav1.Duration `json:"observabilityTimeout,omitempty"`
}

// +kubebuilder:object:root=true
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions lifecycle-operator/chart/templates/keptnconfig-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,20 @@ spec:
description: CloudEventsEndpoint can be used to set the endpoint where
Cloud Events should be posted by the lifecycle operator
type: string
deploymentTimeout:
default: 5m
description: |-
DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
keptnAppCreationRequestTimeoutSeconds:
default: 30
description: |-
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
observabilityTimeout:
default: 5m
description: |-
ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
type: object
status:
description: unused field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ spec:
description: CloudEventsEndpoint can be used to set the endpoint where
Cloud Events should be posted by the lifecycle operator
type: string
deploymentTimeout:
default: 5m
description: |-
DeploymentTimeout specifies the maximum time to wait for the deployment to be in Running state.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
keptnAppCreationRequestTimeoutSeconds:
default: 30
description: |-
KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery
searches for workload to put into the same auto-generated KeptnApp
type: integer
observabilityTimeout:
default: 5m
description: |-
ObservabilityTimeout specifies the maximum time to observe the deployment phase of KeptnWorkload.
If the workload does not deploy successfully within this time frame, it will be
considered as failed.
pattern: ^0|([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
type: object
status:
description: unused field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ metadata:
spec:
OTelCollectorUrl: 'otel-collector:4317'
keptnAppCreationRequestTimeoutSeconds: 30
blockDeployment: true
observabilityTimeout: 5m

0 comments on commit e2d83f2

Please sign in to comment.