Merge pull request #1590 from rh-roman/remove-dead-resourcemerge

Merge pull request #1591 from eggfoobar/bump-deps

bump: pull in latest ocp/api

Merge pull request #1581 from jaypoulz/ocpbugs-81340-pacemaker-cronjob-ttl

OCPBUGS-81340: pacemaker CronJob: tune history limit and Job TTL

Merge pull request #1587 from eggfoobar/upkeep-pacemaker-crd-featuregate

feat: migrate to use the new v1 pacemaker api

feat: add helper task to update and verify crds

bump: ocp/api ocp/client-go

Remove unused lib/resourcemerge package

Merge pull request #1580 from eggfoobar/upkeep-reduce-events

fix: add correct annotations to stop update events

Merge pull request #1556 from vincentdephily/vdp-retstart-on-tls-inject

Merge pull request #1578 from jaypoulz/tnf-kubelet-retry-delay

Restart operator when TLS config changes