Merge pull request #487 from tmshort/sync2

OPRUN-4164: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

Makefile

@@ -189,13 +189,6 @@ fix-lint: $(GOLANGCI_LINT) #EXHELP Fix lint issues
 fmt: #EXHELP Formats code
 	go fmt ./...
 
-.PHONY: bingo-upgrade
-bingo-upgrade: $(BINGO) #EXHELP Upgrade tools
-	@for pkg in $$($(BINGO) list | awk '{ print $$3 }' | tail -n +3 | sed 's/@.*//'); do \
-		echo -e "Upgrading \033[35m$$pkg\033[0m to latest..."; \
-		$(BINGO) get "$$pkg@latest"; \
-	done
-
 .PHONY: verify-crd-compatibility
 CRD_DIFF_ORIGINAL_REF := git://main?path=
 CRD_DIFF_UPDATED_REF := file://

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 0faf118ce37219d518ed380d76101fc3a083a3dd
+expectedMergeBase: 55d9dfbecea64f81bb088c4f1109a1d9df4cbbbb
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller