@@ -110,7 +110,7 @@ manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole,
110110 $(CONTROLLER_GEN ) rbac:roleName=manager-role paths=./internal/... output:rbac:artifacts:config=config/operator-controller/base/rbac
111111 $(CONTROLLER_GEN ) crd paths=./api/... output:crd:artifacts:config=config/operator-controller/base/crd/bases
112112 # To generate the manifests for catalogd
113- $(MAKE ) -C catalogd generate
113+ $(MAKE ) -f Makefile. catalogd generate
114114
115115.PHONY : generate
116116generate : $(CONTROLLER_GEN ) # EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -147,7 +147,7 @@ CRD_DIFF_CONFIG := crd-diff-config.yaml
147147
148148verify-crd-compatibility : $(CRD_DIFF ) manifests
149149 $(CRD_DIFF ) --config=" ${CRD_DIFF_CONFIG} " " git://${CRD_DIFF_ORIGINAL_REF} ?path=config/operator-controller/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE}
150- $(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}
150+ $(CRD_DIFF ) --config=" ${CRD_DIFF_CONFIG} " " git://${CRD_DIFF_ORIGINAL_REF} ?path=config/catalogd /base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CATALOGD_CRD_DIFF_UPDATED_SOURCE}
151151
152152.PHONY : test
153153test : manifests generate fmt vet test-unit test-e2e # HELP Run all tests.
@@ -243,7 +243,7 @@ e2e-coverage:
243243.PHONY : kind-load
244244kind-load : $(KIND ) # EXHELP Loads the currently constructed images into the KIND cluster.
245245 $(CONTAINER_RUNTIME ) save $(IMG ) | $(KIND ) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME )
246- IMAGE_REPO=$(CATALOG_IMAGE_REPO ) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME ) $(MAKE ) -C catalogd kind-load
246+ IMAGE_REPO=$(CATALOG_IMAGE_REPO ) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME ) $(MAKE ) -f Makefile. catalogd kind-load
247247
248248.PHONY : kind-deploy
249249kind-deploy : export MANIFEST := ./operator-controller.yaml
@@ -310,7 +310,7 @@ run: docker-build kind-cluster kind-load kind-deploy #HELP Build the operator-co
310310.PHONY : docker-build
311311docker-build : build-linux # EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
312312 $(CONTAINER_RUNTIME ) build -t $(IMG ) -f Dockerfile ./bin/linux
313- IMAGE_REPO=$(CATALOG_IMAGE_REPO ) $(MAKE ) -C catalogd build-container
313+ IMAGE_REPO=$(CATALOG_IMAGE_REPO ) $(MAKE ) -f Makefile. catalogd build-container
314314
315315# SECTION Release
316316ifeq ($(origin ENABLE_RELEASE_PIPELINE ) , undefined)
0 commit comments