Move catalogd entrypoint to cmd/catalogd (#1802)

Move catalogd entrypoint and merge catalogd and operator-controller
make files

Signed-off-by: Edmund Ochieng <[email protected]>

Author: OchiengEd

.goreleaser.yml

@@ -20,7 +20,7 @@ builds:
       - ppc64le
       - s390x
   - id: catalogd
-    main: ./catalogd/cmd/catalogd/
+    main: ./cmd/catalogd/
     binary: catalogd
     asmflags: "{{ .Env.GO_BUILD_ASMFLAGS }}"
     gcflags: "{{ .Env.GO_BUILD_GCFLAGS }}"
@@ -38,63 +38,63 @@ builds:
 dockers:
   - image_templates:
       - "{{ .Env.OPERATOR_CONTROLLER_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile.operator-controller
     goos: linux
     goarch: amd64
     use: buildx
     build_flag_templates:
       - "--platform=linux/amd64"
   - image_templates:
       - "{{ .Env.OPERATOR_CONTROLLER_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile.operator-controller
     goos: linux
     goarch: arm64
     use: buildx
     build_flag_templates:
       - "--platform=linux/arm64"
   - image_templates:
       - "{{ .Env.OPERATOR_CONTROLLER_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile.operator-controller
     goos: linux
     goarch: ppc64le
     use: buildx
     build_flag_templates:
       - "--platform=linux/ppc64le"
   - image_templates:
       - "{{ .Env.OPERATOR_CONTROLLER_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
-    dockerfile: Dockerfile
+    dockerfile: Dockerfile.operator-controller
     goos: linux
     goarch: s390x
     use: buildx
     build_flag_templates:
       - "--platform=linux/s390x"
   - image_templates:
       - "{{ .Env.CATALOGD_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-amd64"
-    dockerfile: catalogd/Dockerfile
+    dockerfile: Dockerfile.catalogd
     goos: linux
     goarch: amd64
     use: buildx
     build_flag_templates:
       - "--platform=linux/amd64"
   - image_templates:
       - "{{ .Env.CATALOGD_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-arm64"
-    dockerfile: catalogd/Dockerfile
+    dockerfile: Dockerfile.catalogd
     goos: linux
     goarch: arm64
     use: buildx
     build_flag_templates:
       - "--platform=linux/arm64"
   - image_templates:
       - "{{ .Env.CATALOGD_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-ppc64le"
-    dockerfile: catalogd/Dockerfile
+    dockerfile: Dockerfile.catalogd
     goos: linux
     goarch: ppc64le
     use: buildx
     build_flag_templates:
       - "--platform=linux/ppc64le"
   - image_templates:
       - "{{ .Env.CATALOGD_IMAGE_REPO }}:{{ .Env.IMAGE_TAG }}-s390x"
-    dockerfile: catalogd/Dockerfile
+    dockerfile: Dockerfile.catalogd
     goos: linux
     goarch: s390x
     use: buildx

catalogd/Dockerfile renamed to Dockerfile.catalogd

@@ -9,23 +9,28 @@ export ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 GOLANG_VERSION := $(shell sed -En 's/^go (.*)$$/\1/p' "go.mod")
 # Image URL to use all building/pushing image targets
-ifeq ($(origin IMAGE_REPO), undefined)
-IMAGE_REPO := quay.io/operator-framework/operator-controller
+ifeq ($(origin IMG_NAMESPACE), undefined)
+IMG_NAMESPACE := quay.io/operator-framework
 endif
-export IMAGE_REPO
+export IMG_NAMESPACE
 
-ifeq ($(origin CATALOG_IMAGE_REPO), undefined)
-CATALOG_IMAGE_REPO := quay.io/operator-framework/catalogd
+ifeq ($(origin OPERATOR_CONTROLLER_IMAGE_REPO), undefined)
+OPERATOR_CONTROLLER_IMAGE_REPO := $(IMG_NAMESPACE)/operator-controller
 endif
-export CATALOG_IMAGE_REPO
+export OPERATOR_CONTROLLER_IMAGE_REPO
+
+ifeq ($(origin CATALOGD_IMAGE_REPO), undefined)
+CATALOGD_IMAGE_REPO := $(IMG_NAMESPACE)/catalogd
+endif
+export CATALOGD_IMAGE_REPO
 
 ifeq ($(origin IMAGE_TAG), undefined)
 IMAGE_TAG := devel
 endif
 export IMAGE_TAG
 
-IMG := $(IMAGE_REPO):$(IMAGE_TAG)
-CATALOGD_IMG := $(CATALOG_IMAGE_REPO):$(IMAGE_TAG)
+OPERATOR_CONTROLLER_IMG := $(OPERATOR_CONTROLLER_IMAGE_REPO):$(IMAGE_TAG)
+CATALOGD_IMG := $(CATALOGD_IMAGE_REPO):$(IMAGE_TAG)
 
 # Define dependency versions (use go.mod if we also use Go code from dependency)
 export CERT_MGR_VERSION := v1.15.3
@@ -263,8 +268,8 @@ e2e-coverage:
 
 .PHONY: kind-load
 kind-load: $(KIND) #EXHELP Loads the currently constructed images into the KIND cluster.
-	$(CONTAINER_RUNTIME) save $(IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
-	IMAGE_REPO=$(CATALOG_IMAGE_REPO) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) $(MAKE) -C catalogd kind-load
+	$(CONTAINER_RUNTIME) save $(OPERATOR_CONTROLLER_IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
+	$(CONTAINER_RUNTIME) save $(CATALOGD_IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 
 .PHONY: kind-deploy
 kind-deploy: export MANIFEST := ./operator-controller.yaml
@@ -304,8 +309,9 @@ export GO_BUILD_FLAGS :=
 export GO_BUILD_LDFLAGS := -s -w \
     -X '$(VERSION_PATH).version=$(VERSION)' \
 
-BINARIES=operator-controller
+BINARIES=operator-controller catalogd
 
+.PHONY: $(BINARIES)
 $(BINARIES):
 	go build $(GO_BUILD_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
 
@@ -333,9 +339,9 @@ wait:
 	kubectl wait --for=condition=Ready --namespace=$(CATALOGD_NAMESPACE) certificate/catalogd-service-cert # Avoid upgrade test flakes when reissuing cert
 
 .PHONY: docker-build
-docker-build: build-linux  #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
-	$(CONTAINER_RUNTIME) build -t $(IMG) -f Dockerfile ./bin/linux
-	IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(MAKE) -C catalogd build-container
+docker-build: build-linux #EXHELP Build docker image for operator-controller and catalog with GOOS=linux and local GOARCH.
+	$(CONTAINER_RUNTIME) build -t $(OPERATOR_CONTROLLER_IMG) -f Dockerfile.operator-controller ./bin/linux
+	$(CONTAINER_RUNTIME) build -t $(CATALOGD_IMG) -f Dockerfile.catalogd ./bin/linux
 
 #SECTION Release
 ifeq ($(origin ENABLE_RELEASE_PIPELINE), undefined)
@@ -350,7 +356,7 @@ export GORELEASER_ARGS
 
 .PHONY: release
 release: $(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.
-	OPERATOR_CONTROLLER_IMAGE_REPO=$(IMAGE_REPO) CATALOGD_IMAGE_REPO=$(CATALOG_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
+	OPERATOR_CONTROLLER_IMAGE_REPO=$(OPERATOR_CONTROLLER_IMAGE_REPO) CATALOGD_IMAGE_REPO=$(CATALOGD_IMAGE_REPO) $(GORELEASER) $(GORELEASER_ARGS)
 
 .PHONY: quickstart
 quickstart: export MANIFEST := https://github.com/operator-framework/operator-controller/releases/download/$(VERSION)/operator-controller.yaml

Dockerfile renamed to Dockerfile.operator-controller

@@ -15,9 +15,9 @@ catalogd = {
     'image': 'quay.io/operator-framework/catalogd',
     'yaml': 'config/overlays/tilt-local-dev/catalogd',
     'binaries': {
-        './catalogd/cmd/catalogd': 'catalogd-controller-manager',
+        './cmd/catalogd': 'catalogd-controller-manager',
     },
-    'deps': ['api', 'catalogd/cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
+    'deps': ['api', 'cmd/catalogd', 'internal/catalogd', 'internal/shared', 'go.mod', 'go.sum'],
     'starting_debug_port': 20000,
 }