chore(lifecycle-operator): revert unused ObservabilityTimeout paramet…

…er from KeptnWorkload (keptn#3163) Signed-off-by: odubajDT <[email protected]> Signed-off-by: vickysomtee <[email protected]>
Vickysomtee · Apr 22, 2024 · 0dc2e8e · 0dc2e8e
1 parent 23bd0a9
commit 0dc2e8e
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 93 deletions.
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
@@ -7040,6 +7040,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7125,6 +7126,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7310,14 +7312,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed
@@ -7807,14 +7801,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -6986,6 +6986,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7071,6 +7072,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7256,14 +7258,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed
@@ -7753,14 +7747,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -7020,6 +7020,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7105,6 +7106,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -7290,14 +7292,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed
@@ -7788,14 +7782,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/docs/docs/reference/api-reference/lifecycle/v1beta1/index.md b/docs/docs/reference/api-reference/lifecycle/v1beta1/index.md
@@ -862,7 +862,6 @@ _Appears in:_
 | `postDeploymentEvaluations` _string array_ | PostDeploymentEvaluations is a list of all evaluations to be performed during the post-deployment phase of the KeptnWorkload. The items of this list refer to the names of KeptnEvaluationDefinitions located in the same namespace as the KeptnWorkload, or in the Keptn namespace. || ✓ |
 | `resourceReference` _[ResourceReference](#resourcereference)_ | ResourceReference is a reference to the Kubernetes resource (Deployment, DaemonSet, StatefulSet or ReplicaSet) the KeptnWorkload is representing. || x |
 | `metadata` _object (keys:string, values:string)_ | Metadata contains additional key-value pairs for contextual information. || ✓ |
-| `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| ✓ |
 
 
 #### KeptnWorkloadStatus
@@ -932,7 +931,6 @@ _Appears in:_
 | `postDeploymentEvaluations` _string array_ | PostDeploymentEvaluations is a list of all evaluations to be performed during the post-deployment phase of the KeptnWorkload. The items of this list refer to the names of KeptnEvaluationDefinitions located in the same namespace as the KeptnWorkload, or in the Keptn namespace. || ✓ |
 | `resourceReference` _[ResourceReference](#resourcereference)_ | ResourceReference is a reference to the Kubernetes resource (Deployment, DaemonSet, StatefulSet or ReplicaSet) the KeptnWorkload is representing. || x |
 | `metadata` _object (keys:string, values:string)_ | Metadata contains additional key-value pairs for contextual information. || ✓ |
-| `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| ✓ |
 | `workloadName` _string_ | WorkloadName is the name of the KeptnWorkload. || x |
 | `previousVersion` _string_ | PreviousVersion is the version of the KeptnWorkload that has been deployed prior to this version. || ✓ |
 | `traceId` _object (keys:string, values:string)_ | TraceId contains the OpenTelemetry trace ID. || ✓ |

diff --git a/lifecycle-operator/apis/lifecycle/v1beta1/keptnworkload_types.go b/lifecycle-operator/apis/lifecycle/v1beta1/keptnworkload_types.go
@@ -61,14 +61,6 @@ type KeptnWorkloadSpec struct {
 	// +optional
 	// Metadata contains additional key-value pairs for contextual information.
 	Metadata map[string]string `json:"metadata,omitempty"`
-	// 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
-	ObservabilityTimeout metav1.Duration `json:"observabilityTimeout,omitempty"`
 }
 
 // KeptnWorkloadStatus defines the observed state of KeptnWorkload

diff --git a/lifecycle-operator/apis/lifecycle/v1beta1/zz_generated.deepcopy.go b/lifecycle-operator/apis/lifecycle/v1beta1/zz_generated.deepcopy.go
diff --git a/lifecycle-operator/chart/templates/keptnworkload-crd.yaml b/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
@@ -73,6 +73,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -158,6 +159,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -343,14 +345,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml b/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
@@ -409,14 +409,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml
@@ -96,6 +96,7 @@ spec:
               previousVersion:
                 type: string
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -339,6 +340,7 @@ spec:
               previousVersion:
                 type: string
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string

diff --git a/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml
@@ -65,6 +65,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -150,6 +151,7 @@ spec:
                   type: string
                 type: array
               resourceReference:
+                description: ResourceReference represents the parent resource of Workload
                 properties:
                   kind:
                     type: string
@@ -335,14 +337,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadversions.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadversions.yaml
@@ -401,14 +401,6 @@ spec:
                 description: Metadata contains additional key-value pairs for contextual
                   information.
                 type: object
-              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
               postDeploymentEvaluations:
                 description: |-
                   PostDeploymentEvaluations is a list of all evaluations to be performed

diff --git a/lifecycle-operator/config/samples/lifecycle_v1beta1_keptnworkload.yaml b/lifecycle-operator/config/samples/lifecycle_v1beta1_keptnworkload.yaml
@@ -3,7 +3,6 @@ kind: KeptnWorkload
 metadata:
   name: keptnworkload-sample
 spec:
-  observabilityTimeout: 5m
   app: "some-keptn-app2"
   version: "0.2.7"
   preDeploymentTasks:

diff --git a/lifecycle-operator/config/samples/lifecycle_v1beta1_keptnworkloadversion.yaml b/lifecycle-operator/config/samples/lifecycle_v1beta1_keptnworkloadversion.yaml
@@ -5,7 +5,6 @@ metadata:
     traceparent: my-trace-parent
   name: some-keptn-workload-version
 spec:
-  observabilityTimeout: 5m
   app: podtato-head
   resourceReference:
     kind: ReplicaSet