[SAPBTPCFS-7876] Optimize handling of non-transient errors

SAP · Jan 22, 2024 · f59183f · f59183f
1 parent 409c422
commit f59183f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/api/v1/servicebinding_types.go b/api/v1/servicebinding_types.go
@@ -195,7 +195,7 @@ func (sb *ServiceBinding) GetAnnotations() map[string]string {
 func (sb *ServiceBinding) SetAnnotations(annotations map[string]string) {
 	sb.Annotations = annotations
 }
-func (sb *ServiceBinding) SetFirstErrorTimestamp(time *metav1.Time) {
+func (sb *ServiceBinding) SetFirstErrorTimestamp(_ *metav1.Time) {
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/servicebinding_types.go b/api/v1alpha1/servicebinding_types.go
@@ -179,7 +179,7 @@ func (sb *ServiceBinding) GetReady() metav1.ConditionStatus {
 func (sb *ServiceBinding) SetReady(ready metav1.ConditionStatus) {
 	sb.Status.Ready = ready
 }
-func (sb *ServiceBinding) SetFirstErrorTimestamp(time *metav1.Time) {
+func (sb *ServiceBinding) SetFirstErrorTimestamp(_ *metav1.Time) {
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/serviceinstance_types.go b/api/v1alpha1/serviceinstance_types.go
@@ -173,8 +173,8 @@ func (in *ServiceInstance) GetReady() metav1.ConditionStatus {
 func (in *ServiceInstance) SetReady(ready metav1.ConditionStatus) {
 	in.Status.Ready = ready
 }
-func (si *ServiceInstance) SetFirstErrorTimestamp(time *metav1.Time) {
-	si.Status.FirstErrorTimestamp = time
+func (in *ServiceInstance) SetFirstErrorTimestamp(time *metav1.Time) {
+	in.Status.FirstErrorTimestamp = time
 }
 
 // +kubebuilder:object:root=true

diff --git a/controllers/serviceinstance_controller.go b/controllers/serviceinstance_controller.go
@@ -720,19 +720,3 @@ func getErrorMsgFromLastOperation(status *smClientTypes.Operation) string {
 	}
 	return errMsg
 }
-
-func markNonTransientStatusAsTransient(serviceInstance *servicesv1.ServiceInstance) {
-	conditions := serviceInstance.GetConditions()
-	lastOpCondition := meta.FindStatusCondition(conditions, common.ConditionSucceeded)
-	operation := smClientTypes.CREATE
-	if len(serviceInstance.Status.InstanceID) > 0 {
-		operation = smClientTypes.UPDATE
-	}
-	lastOpCondition.Reason = utils.GetConditionReason(operation, smClientTypes.INPROGRESS)
-
-	if len(conditions) > 0 {
-		meta.RemoveStatusCondition(&conditions, common.ConditionFailed)
-	}
-	meta.SetStatusCondition(&conditions, *lastOpCondition)
-	serviceInstance.SetConditions(conditions)
-}