Fix up PDB patching test

Author: andrewstucki

operator/pkg/resources/resource.go

@@ -138,7 +138,7 @@ func Update(
 	opts := []patch.CalculateOption{
 		patch.IgnoreStatusFields(),
 		patch.IgnoreVolumeClaimTemplateTypeMetaAndStatus(),
-		patch.IgnorePDBSelector(),
+		utils.IgnorePDBSelector(), // we leverage the pdb selector for non-PDB resources, so we had to fork the one in "patch"
 		utils.IgnoreAnnotation(redpandaAnnotatorKey),
 	}
 	annotator := patch.NewAnnotator(redpandaAnnotatorKey)

operator/pkg/utils/patch.go

@@ -12,7 +12,9 @@ package utils
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
 
+	"emperror.dev/errors"
 	"github.com/cisco-open/k8s-objectmatcher/patch"
 	jsoniter "github.com/json-iterator/go"
 )
@@ -72,3 +74,59 @@ func removeElement(m map[string]interface{}, path ...string) bool {
 	delete(cur, lastKey)
 	return exists
 }
+
+// taken from github.com/cisco-open/k8s-objectmatcher/patch but with some modifications to work
+// with newer typed PDBs
+func IgnorePDBSelector() patch.CalculateOption {
+	return func(current, modified []byte) ([]byte, []byte, error) {
+		currentResource := map[string]any{}
+		if err := jsoniter.Unmarshal(current, &currentResource); err != nil {
+			return []byte{}, []byte{}, errors.Wrap(err, "could not unmarshal byte sequence for current")
+		}
+
+		modifiedResource := map[string]any{}
+		if err := jsoniter.Unmarshal(modified, &modifiedResource); err != nil {
+			return []byte{}, []byte{}, errors.Wrap(err, "could not unmarshal byte sequence for modified")
+		}
+
+		if reflect.DeepEqual(getPDBSelector(currentResource), getPDBSelector(modifiedResource)) {
+			var err error
+			current, err = deletePDBSelector(currentResource)
+			if err != nil {
+				return nil, nil, errors.Wrap(err, "delete pdb selector from current")
+			}
+			modified, err = deletePDBSelector(modifiedResource)
+			if err != nil {
+				return nil, nil, errors.Wrap(err, "delete pdb selector from modified")
+			}
+		}
+
+		return current, modified, nil
+	}
+}
+
+func getPDBSelector(resource map[string]interface{}) interface{} {
+	if spec, ok := resource["spec"]; ok {
+		if spec, ok := spec.(map[string]any); ok {
+			if selector, ok := spec["selector"]; ok {
+				return selector
+			}
+		}
+	}
+	return nil
+}
+
+func deletePDBSelector(resource map[string]interface{}) ([]byte, error) {
+	if spec, ok := resource["spec"]; ok {
+		if spec, ok := spec.(map[string]any); ok {
+			delete(spec, "selector")
+		}
+	}
+
+	obj, err := jsoniter.ConfigCompatibleWithStandardLibrary.Marshal(resource)
+	if err != nil {
+		return []byte{}, errors.Wrap(err, "could not marshal byte sequence")
+	}
+
+	return obj, nil
+}