Fix patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus and add it as a …

…default ignore calculation (#37)
cisco-open · Jan 14, 2021 · af0ea18 · af0ea18
1 parent 5d55e0c
commit af0ea18
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/patch/deletenull.go b/patch/deletenull.go
@@ -20,8 +20,6 @@ import (
 
 	"emperror.dev/errors"
 	json "github.com/json-iterator/go"
-	v1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
@@ -191,21 +189,31 @@ func deleteStatusField(obj []byte) ([]byte, error) {
 }
 
 func deleteVolumeClaimTemplateFields(obj []byte) ([]byte, error) {
-	sts := v1.StatefulSet{}
-	err := json.Unmarshal(obj, &sts)
+	resource := map[string]interface{}{}
+	err := json.Unmarshal(obj, &resource)
 	if err != nil {
 		return []byte{}, errors.Wrap(err, "could not unmarshal byte sequence")
 	}
 
-	for i := range sts.Spec.VolumeClaimTemplates {
-		sts.Spec.VolumeClaimTemplates[i].Kind = ""
-		sts.Spec.VolumeClaimTemplates[i].APIVersion = ""
-		sts.Spec.VolumeClaimTemplates[i].Status = corev1.PersistentVolumeClaimStatus{
-			Phase: corev1.ClaimPending,
+	if spec, ok := resource["spec"]; ok {
+		if spec, ok := spec.(map[string]interface{}); ok {
+			if vcts, ok := spec["volumeClaimTemplates"]; ok {
+				if vcts, ok := vcts.([]interface{}); ok {
+					for _, vct := range vcts {
+						if vct, ok := vct.(map[string]interface{}); ok {
+							vct["kind"] = ""
+							vct["apiVersion"] = ""
+							vct["status"] = map[string]string{
+								"phase": "Pending",
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 
-	obj, err = json.ConfigCompatibleWithStandardLibrary.Marshal(sts)
+	obj, err = json.ConfigCompatibleWithStandardLibrary.Marshal(resource)
 	if err != nil {
 		return []byte{}, errors.Wrap(err, "could not marshal byte sequence")
 	}

diff --git a/tests/main_test.go b/tests/main_test.go
@@ -190,6 +190,7 @@ func testMatchOnObject(testItem *TestItem) error {
 	var err error
 	opts := []patch.CalculateOption{
 		patch.IgnoreStatusFields(),
+		patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus(),
 	}
 
 	newObject := testItem.object
@@ -403,7 +404,6 @@ func testMatchOnObject(testItem *TestItem) error {
 			}
 		}()
 	case *appsv1.StatefulSet:
-		opts = append(opts, patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus())
 		existing, err = testContext.Client.AppsV1().StatefulSets(newObject.GetNamespace()).Create(context.Background(), newObject.(*appsv1.StatefulSet), metav1.CreateOptions{})
 		if err != nil {
 			return errors.WrapWithDetails(err, "failed to create object", "object", newObject)