Remove CRDs from old locations (#1791)

This is a cleanup commit to allow the verify-crd-compatibility target
to continue working through the config consoldiation effort.

This updates the verify-crd-compatibility recipe to target the new
CRD locations and removes the CRDs from the old locations.

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

.github/workflows/crd-diff.yaml

@@ -16,6 +16,5 @@ jobs:
       - name: Run make verify-crd-compatibility
         run: |
           make verify-crd-compatibility \
-            CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} \
-            CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" \
-            CATALOGD_CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml"
+            CRD_DIFF_ORIGINAL_REF="git://${{ github.event.pull_request.base.sha }}?path=" \
+            CRD_DIFF_UPDATED_REF="git://${{ github.event.pull_request.head.sha }}?path="

Makefile

@@ -151,15 +151,14 @@ bingo-upgrade: $(BINGO) #EXHELP Upgrade tools
 	done
 
 .PHONY: verify-crd-compatibility
-CRD_DIFF_ORIGINAL_REF := main
-CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
-CATALOGD_CRD_DIFF_UPDATED_SOURCE := file://catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
+CRD_DIFF_ORIGINAL_REF := git://main?path=
+CRD_DIFF_UPDATED_REF := file://
+CRD_DIFF_OPCON_SOURCE := config/base/operator-controller/crd/bases/olm.operatorframework.io_clusterextensions.yaml
+CRD_DIFF_CATD_SOURCE := config/base/catalogd/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
 CRD_DIFF_CONFIG := crd-diff-config.yaml
-
 verify-crd-compatibility: $(CRD_DIFF) manifests
-	$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE}
-	$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CATALOGD_CRD_DIFF_UPDATED_SOURCE}
-
+	$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "${CRD_DIFF_ORIGINAL_REF}${CRD_DIFF_OPCON_SOURCE}" ${CRD_DIFF_UPDATED_REF}${CRD_DIFF_OPCON_SOURCE}
+	$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "${CRD_DIFF_ORIGINAL_REF}${CRD_DIFF_CATD_SOURCE}" ${CRD_DIFF_UPDATED_REF}${CRD_DIFF_CATD_SOURCE}
 
 .PHONY: test
 test: manifests generate fmt lint test-unit test-e2e #HELP Run all tests.