@@ -24,13 +24,19 @@ CATD_IMAGE_REPO := $(IMAGE_REGISTRY)/catalogd
2424endif
2525export CATD_IMAGE_REPO
2626
27+ ifeq ($(origin OBJECT_CONTROLLER_IMAGE_REPO ) , undefined)
28+ OBJECT_CONTROLLER_IMAGE_REPO := $(IMAGE_REGISTRY ) /object-controller
29+ endif
30+ export OBJECT_CONTROLLER_IMAGE_REPO
31+
2732ifeq ($(origin IMAGE_TAG ) , undefined)
2833IMAGE_TAG := devel
2934endif
3035export IMAGE_TAG
3136
3237OPCON_IMG := $(OPCON_IMAGE_REPO ) :$(IMAGE_TAG )
3338CATD_IMG := $(CATD_IMAGE_REPO ) :$(IMAGE_TAG )
39+ OBJECT_CONTROLLER_IMG := $(OBJECT_CONTROLLER_IMAGE_REPO ) :$(IMAGE_TAG )
3440
3541# Extract Kubernetes client-go version used to set the version to the PSA labels, for ENVTEST and KIND
3642ifeq ($(origin K8S_VERSION ) , undefined)
@@ -351,6 +357,7 @@ kind-cluster-%: $(KIND) #EXHELP Create a kind cluster named after the stem (%).
351357kind-load-% : kind-cluster-% docker-build
352358 $(KIND ) load docker-image $(OPCON_IMG ) --name $*
353359 $(KIND ) load docker-image $(CATD_IMG ) --name $*
360+ $(KIND ) load docker-image $(OBJECT_CONTROLLER_IMG ) --name $*
354361
355362.PHONY : kind-deploy-%
356363kind-deploy-% : kind-load-% manifests
@@ -605,7 +612,7 @@ export GO_BUILD_LDFLAGS := -s -w \
605612 -X '$(VERSION_PATH ) .version=$(VERSION ) ' \
606613 -X '$(VERSION_PATH ) .gitCommit=$(GIT_COMMIT ) ' \
607614
608- BINARIES =operator-controller catalogd
615+ BINARIES =operator-controller catalogd object-controller
609616
610617.PHONY : $(BINARIES )
611618$(BINARIES ) :
@@ -644,9 +651,10 @@ FLUENTBIT_NAMESPACE := fluent-bit
644651FLUENTBIT_CHART_VERSION := 0.57.9
645652
646653.PHONY : docker-build
647- docker-build : build-linux # EXHELP Build docker image for operator- controller and catalog with GOOS=linux and local GOARCH.
654+ docker-build : build-linux # EXHELP Build controller images with GOOS=linux and local GOARCH.
648655 $(CONTAINER_RUNTIME ) build -t $(OPCON_IMG ) -f Dockerfile.operator-controller ./bin/linux
649656 $(CONTAINER_RUNTIME ) build -t $(CATD_IMG ) -f Dockerfile.catalogd ./bin/linux
657+ $(CONTAINER_RUNTIME ) build -t $(OBJECT_CONTROLLER_IMG ) -f Dockerfile.object-controller ./bin/linux
650658
651659# SECTION Release
652660ifeq ($(origin ENABLE_RELEASE_PIPELINE ) , undefined)
@@ -661,7 +669,7 @@ export GORELEASER_ARGS
661669
662670.PHONY : release
663671release : $(GORELEASER ) # EXHELP Runs goreleaser for the operator-controller. By default, this will run only as a snapshot and will not publish any artifacts unless it is run with different arguments. To override the arguments, run with "GORELEASER_ARGS=...". When run as a github action from a tag, this target will publish a full release.
664- OPCON_IMAGE_REPO=$(OPCON_IMAGE_REPO ) CATD_IMAGE_REPO=$(CATD_IMAGE_REPO ) $(GORELEASER ) $(GORELEASER_ARGS )
672+ OPCON_IMAGE_REPO=$(OPCON_IMAGE_REPO ) CATD_IMAGE_REPO=$(CATD_IMAGE_REPO ) OBJECT_CONTROLLER_IMAGE_REPO= $( OBJECT_CONTROLLER_IMAGE_REPO ) $(GORELEASER ) $(GORELEASER_ARGS )
665673
666674.PHONY : quickstart
667675quickstart : export STANDARD_MANIFEST_URL := "https://github.com/operator-framework/operator-controller/releases/download/$(VERSION ) /$(notdir $(STANDARD_RELEASE_MANIFEST ) ) "
0 commit comments