Add Check for kind and remove duplicated Conditions Check

derbauer97 · derbauer97 · commit 337ae88c589d · 2021-12-17T14:43:57.000+01:00
Signed-off-by: Florian Fl Bauer &lt;florian.fl.bauer@deutschebahn.com&gt;
diff --git a/controllers/kustomization_controller.go b/controllers/kustomization_controller.go
@@ -491,7 +491,7 @@ func (r *KustomizationReconciler) checkDependencies(source sourcev1.Source, kust
 			return fmt.Errorf("dependency '%s' is not ready", dName)
 		}
 		
-		if len(k.Status.Conditions) == 0 || k.Spec.SourceRef.Name == kustomization.Spec.SourceRef.Name && k.Spec.SourceRef.Namespace == kustomization.Spec.SourceRef.Namespace && source.GetArtifact().Revision != k.Status.LastAppliedRevision {
+		if k.Spec.SourceRef.Name == kustomization.Spec.SourceRef.Name && k.Spec.SourceRef.Namespace == kustomization.Spec.SourceRef.Namespace && k.Spec.SourceRef.Kind == kustomization.Spec.SourceRef.Kind && source.GetArtifact().Revision != k.Status.LastAppliedRevision {
 			return fmt.Errorf("dependency '%s' is not updated yet", dName)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ func (r *KustomizationReconciler) checkDependencies(source sourcev1.Source, kust`
`491`	`491`	`return fmt.Errorf("dependency '%s' is not ready", dName)`
`492`	`492`	`}`
`493`	`493`
`494`		`- if len(k.Status.Conditions) == 0 \|\| k.Spec.SourceRef.Name == kustomization.Spec.SourceRef.Name && k.Spec.SourceRef.Namespace == kustomization.Spec.SourceRef.Namespace && source.GetArtifact().Revision != k.Status.LastAppliedRevision {`
	`494`	`+ if k.Spec.SourceRef.Name == kustomization.Spec.SourceRef.Name && k.Spec.SourceRef.Namespace == kustomization.Spec.SourceRef.Namespace && k.Spec.SourceRef.Kind == kustomization.Spec.SourceRef.Kind && source.GetArtifact().Revision != k.Status.LastAppliedRevision {`
`495`	`495`	`return fmt.Errorf("dependency '%s' is not updated yet", dName)`
`496`	`496`	`}`
`497`	`497`	`}`