Fix image manifest generation

Author: deitch

Makefile

@@ -1,5 +1,8 @@
 .PHONY: vendor test manager clusterctl run install deploy manifests generate fmt vet run
 
+GIT_VERSION?=$(shell git log -1 --format="%h")
+RELEASE_TAG ?= $(shell git tag --points-at HEAD)
+
 # BUILDARCH is the host architecture
 # ARCH is the target architecture
 # we need to keep track of them separately
@@ -30,7 +33,9 @@ OS ?= $(BUILDOS)
 
 
 # Image URL to use all building/pushing image targets
-IMG ?= packethost/cluster-api-provider-packet:latest
+BUILD_IMAGE ?= packethost/cluster-api-provider-packet
+BUILD_IMAGE_TAG ?= $(BUILD_IMAGE):latest
+PUSH_IMAGE_TAG ?= $(BUILD_IMAGE):$(IMAGETAG)
 PROVIDERYAML ?= provider-components.yaml.template
 CLUSTERCTL ?= bin/clusterctl-$(OS)-$(ARCH)
 MANAGER ?= bin/manager-$(OS)-$(ARCH)
@@ -45,6 +50,25 @@ vendor:
 	$(GO) mod vendor
 	./hack/update-vendor.sh
 
+ci: fmt vet test image
+
+imagetag:
+ifndef IMAGETAG
+	$(error IMAGETAG is undefined - run using make <target> IMAGETAG=X.Y.Z)
+endif
+
+tag-image: imagetag
+	docker tag $(BUILD_IMAGE_TAG) $(PUSH_IMAGE_TAG)
+
+confirm:
+ifndef CONFIRM
+	$(error CONFIRM is undefined - run using make <target> CONFIRM=true)
+endif
+
+cd: confirm
+	$(MAKE) tag-image push IMAGETAG=$(GIT_VERSION)
+
+
 # Run tests
 test: vendor generate fmt vet manifests
 	$(GO) test -mod=vendor ./pkg/... ./cmd/... -coverprofile cover.out
@@ -75,7 +99,18 @@ deploy: manifests $(CLUSTERCTL)
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: $(PROVIDERYAML)
 $(PROVIDERYAML):
+	# which image do we patch in? BUILD_IMAGE_TAG or PUSH_IMAGE_TAG? Depends on if it is set
+ifdef IMAGETAG
+	$(eval PATCH_IMAGE_TAG := $(PUSH_IMAGE_TAG))
+else
+	$(eval PATCH_IMAGE_TAG := $(BUILD_IMAGE_TAG))
+endif
+	# generate
 	$(GO) run -mod=vendor vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go all
+	# patch the particular image tag we will want to deploy
+	@echo "updating kustomize image patch file for manager resource"
+	sed -i'' -e 's@PATCH_ME_IMAGE@image: '"$(PATCH_IMAGE_TAG)"'@' ./config/default/manager_image_patch.yaml
+	# create the manifests
 	$(KUBECTL) kustomize vendor/sigs.k8s.io/cluster-api/config/default/ > $(PROVIDERYAML)
 	echo "---" >> $(PROVIDERYAML)
 	$(KUBECTL) kustomize config/ >> $(PROVIDERYAML)
@@ -97,14 +132,13 @@ endif
 	$(GO) generate -mod=vendor ./pkg/... ./cmd/...
 
 # Build the docker image
+image: docker-build
 docker-build: test
-	docker build . -t ${IMG}
-	@echo "updating kustomize image patch file for manager resource"
-	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_image_patch.yaml
+	docker build -t $(BUILD_IMAGE_TAG) .
 
 # Push the docker image
-docker-push:
-	docker push ${IMG}
+push:
+	docker push $(PUSH_IMAGE_TAG)
 
-image-name:
-	@echo ${IMG}
+image-tag:
+	@echo $(PUSH_IMAGE_TAG)

config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: packethost/cluster-api-provider-packet:latest
+      - image: PATCH_ME_IMAGE
         name: manager