Merge pull request #355 from werf/fix/external-secrets-readying-when-no-status

fix: external secrets readying if external secret has no status

Author: ilya-lesikov

pkg/tracker/generic/ready_condition.go

@@ -15,25 +15,40 @@ func NewResourceStatusIndicator(object *unstructured.Unstructured) (indicator *i
 
 	var matchedCondition *ResourceStatusJSONPathCondition
 	for _, condition := range ResourceStatusJSONPathConditions {
-		if condition.GroupKind != nil && *condition.GroupKind != groupKind {
-			continue
-		}
+		exactCondition := condition.GroupKind != nil
 
-		currentValue, found, err := utils.JSONPath(condition.JSONPath, object.UnstructuredContent())
-		if err != nil {
-			return nil, "", fmt.Errorf("jsonpath error: %w", err)
-		} else if !found {
-			continue
-		}
+		if exactCondition {
+			exactMatch := *condition.GroupKind == groupKind
+			if !exactMatch {
+				continue
+			}
 
-		knownValues := lo.Union(condition.ReadyValues, condition.PendingValues, condition.FailedValues)
+			currentValue, _, err := utils.JSONPath(condition.JSONPath, object.UnstructuredContent())
+			if err != nil {
+				return nil, "", fmt.Errorf("jsonpath error: %w", err)
+			}
 
-		if lo.Contains(knownValues, currentValue) {
 			matchedCondition = condition
 			matchedCondition.CurrentValue = currentValue
 			break
+		} else {
+			currentValue, found, err := utils.JSONPath(condition.JSONPath, object.UnstructuredContent())
+			if err != nil {
+				return nil, "", fmt.Errorf("jsonpath error: %w", err)
+			} else if !found {
+				continue
+			}
+
+			knownValues := lo.Union(condition.ReadyValues, condition.PendingValues, condition.FailedValues)
+
+			if lo.Contains(knownValues, currentValue) {
+				matchedCondition = condition
+				matchedCondition.CurrentValue = currentValue
+				break
+			}
 		}
 	}
+
 	if matchedCondition == nil {
 		return nil, "", nil
 	}