fix sts pvc logic

Co-authored-by: yelshall <[email protected]>
Signed-off-by: Julian Lawrence <[email protected]>

pkg/resourceinterpreter/default/native/dependencies.go

@@ -132,7 +132,28 @@ func getStatefulSetDependencies(object *unstructured.Unstructured) ([]configv1al
 		return nil, err
 	}
 
-	return helper.GetDependenciesFromPodTemplate(podObj)
+	var validDeps []configv1alpha1.DependentObjectReference
+	deps, err := helper.GetDependenciesFromPodTemplate(podObj)
+	if err != nil {
+		return nil, err
+	}
+
+	// ignore the PersistentVolumeClaim dependency if it was created by the StatefulSet VolumeClaimTemplates
+	for _, dep := range deps {
+		if dep.Kind != "PersistentVolumeClaim" ||
+			len(statefulSetObj.Spec.VolumeClaimTemplates) == 0 {
+			validDeps = append(validDeps, dep)
+			continue
+		}
+		for _, volumeClaimTemplate := range statefulSetObj.Spec.VolumeClaimTemplates {
+			if dep.Name == volumeClaimTemplate.Name {
+				continue
+			}
+			validDeps = append(validDeps, dep)
+		}
+	}
+
+	return validDeps, nil
 }
 
 func getIngressDependencies(object *unstructured.Unstructured) ([]configv1alpha1.DependentObjectReference, error) {

pkg/resourceinterpreter/default/native/dependencies_test.go

@@ -861,6 +861,39 @@ func Test_getStatefulSetDependencies(t *testing.T) {
 			want:    testPairs[2].dependentObjectReference,
 			wantErr: false,
 		},
+		{
+			name: "statefulset with partial dependencies 4",
+			object: &unstructured.Unstructured{
+				Object: map[string]interface{}{
+					"apiVersion": "apps/v1",
+					"kind":       "StatefulSet",
+					"metadata": map[string]interface{}{
+						"name":      "fake-statefulset",
+						"namespace": namespace,
+					},
+					"spec": map[string]interface{}{
+						"serviceName": "fake-service",
+						"selector": map[string]interface{}{
+							"matchLabels": map[string]interface{}{
+								"app": "fake",
+							},
+						},
+						"template": map[string]interface{}{
+							"spec": testPairs[0].podSpecsWithDependencies.Object,
+						},
+						"volumeClaimTemplates": []interface{}{
+							map[string]interface{}{
+								"metadata": map[string]interface{}{
+									"name": "test-pvc",
+								},
+							},
+						},
+					},
+				},
+			},
+			want:    testPairs[0].dependentObjectReference[:3], // remove the pvc dependency because it was found in the volumeClaimTemplates
+			wantErr: false,
+		},
 	}
 
 	for i := range tests {