build: Fix codegen for releases (#2662)

Makefile

@@ -31,7 +31,8 @@ ifneq ($(findstring release,$(GIT_BRANCH)),)
 # this will be something like "v2.5" or "v3.7"
 MAJOR_MINOR := v$(word 2,$(subst -, ,$(GIT_BRANCH)))
 # if GIT_TAG is on HEAD, then this will be the same
-GIT_LATEST_TAG := $(shell git describe --abbrev=0 --tags)
+GIT_LATEST_TAG := $(shell git tag --merged | tail -n1)
+# only use the latest tag if it matches the correct major/minor version
 ifneq ($(findstring $(MAJOR_MINOR),$(GIT_LATEST_TAG)),)
 VERSION := $(GIT_LATEST_TAG)
 endif
@@ -53,6 +54,10 @@ DEV_IMAGE             := true
 endif
 endif
 
+# version change, so does the file location
+MANIFEST_VERSION_FILE := dist/$(MANIFEST_VERSION)
+VERSION_FILE          := dist/$(VERSION)
+
 # perform static compilation
 STATIC_BUILD          ?= true
 CI                    ?= false
@@ -226,14 +231,19 @@ $(HOME)/go/bin/mockery:
 	go get github.com/vektra/mockery/.../
 	$(call restore_go_mod)
 
+.PHONY: mocks
+mocks: dist/update-mocks
+
 dist/update-mocks: $(HOME)/go/bin/mockery $(MOCK_FILES)
 	./hack/update-mocks.sh $(MOCK_FILES)
 	@mkdir -p dist
 	touch dist/update-mocks
 
-
 .PHONY: codegen
-codegen: dist/update-mocks
+codegen: status codegen-core swagger mocks docs
+
+.PHONY: codegen-core
+codegen-core:
 	$(call backup_go_mod)
 	# We need the folder for compatibility
 	go mod vendor
@@ -242,29 +252,28 @@ codegen: dist/update-mocks
 	# Updated codegen
 	./hack/update-codegen.sh
 	$(call restore_go_mod)
-	make api/openapi-spec/swagger.json
 
 .PHONY: manifests
 manifests: status manifests/install.yaml manifests/namespace-install.yaml manifests/quick-start-mysql.yaml manifests/quick-start-postgres.yaml manifests/quick-start-no-db.yaml test/e2e/manifests/postgres.yaml test/e2e/manifests/mysql.yaml test/e2e/manifests/no-db.yaml
 
 # we use a different file to ./VERSION to force updating manifests after a `make clean`
-dist/MANIFESTS_VERSION:
+$(MANIFEST_VERSION_FILE):
 	@mkdir -p dist
-	echo $(MANIFESTS_VERSION) > dist/MANIFESTS_VERSION
+	touch $(MANIFEST_VERSION_FILE)
 
-manifests/install.yaml: dist/MANIFESTS_VERSION $(MANIFESTS)
+manifests/install.yaml: $(MANIFEST_VERSION_FILE) $(MANIFESTS)
 	kustomize build --load_restrictor=LoadRestrictionsNone manifests/cluster-install | sed "s/:latest/:$(MANIFESTS_VERSION)/" | ./hack/auto-gen-msg.sh > manifests/install.yaml
 
-manifests/namespace-install.yaml: dist/MANIFESTS_VERSION $(MANIFESTS)
+manifests/namespace-install.yaml: $(MANIFEST_VERSION_FILE) $(MANIFESTS)
 	kustomize build --load_restrictor=LoadRestrictionsNone manifests/namespace-install | sed "s/:latest/:$(MANIFESTS_VERSION)/" | ./hack/auto-gen-msg.sh > manifests/namespace-install.yaml
 
-manifests/quick-start-no-db.yaml: dist/MANIFESTS_VERSION $(MANIFESTS)
+manifests/quick-start-no-db.yaml: $(MANIFEST_VERSION_FILE) $(MANIFESTS)
 	kustomize build --load_restrictor=LoadRestrictionsNone manifests/quick-start/no-db | sed "s/:latest/:$(MANIFESTS_VERSION)/" | ./hack/auto-gen-msg.sh > manifests/quick-start-no-db.yaml
 
-manifests/quick-start-mysql.yaml: dist/MANIFESTS_VERSION $(MANIFESTS)
+manifests/quick-start-mysql.yaml: $(MANIFEST_VERSION_FILE) $(MANIFESTS)
 	kustomize build --load_restrictor=LoadRestrictionsNone manifests/quick-start/mysql | sed "s/:latest/:$(MANIFESTS_VERSION)/" | ./hack/auto-gen-msg.sh > manifests/quick-start-mysql.yaml
 
-manifests/quick-start-postgres.yaml: dist/MANIFESTS_VERSION $(MANIFESTS)
+manifests/quick-start-postgres.yaml: $(MANIFEST_VERSION_FILE) $(MANIFESTS)
 	kustomize build --load_restrictor=LoadRestrictionsNone manifests/quick-start/postgres | sed "s/:latest/:$(MANIFESTS_VERSION)/" | ./hack/auto-gen-msg.sh > manifests/quick-start-postgres.yaml
 
 # lint/test/etc
@@ -292,15 +301,15 @@ else
 	go test -v -covermode=count -coverprofile=coverage.out `go list ./... | grep -v 'test/e2e'`
 endif
 
-dist/VERSION:
+$(VERSION_FILE):
 	@mkdir -p dist
-	echo $(MANIFESTS_VERSION) > dist/VERSION
+	touch $(VERSION_FILE)
 
 test/e2e/manifests/postgres.yaml: $(MANIFESTS) $(E2E_MANIFESTS)
 	# Create Postgres e2e manifests
 	kustomize build --load_restrictor=LoadRestrictionsNone test/e2e/manifests/postgres | ./hack/auto-gen-msg.sh > test/e2e/manifests/postgres.yaml
 
-dist/postgres.yaml: test/e2e/manifests/postgres.yaml dist/VERSION
+dist/postgres.yaml: test/e2e/manifests/postgres.yaml $(VERSION_FILE)
 	# Create Postgres e2e manifests
 	cat test/e2e/manifests/postgres.yaml | sed 's/:latest/:$(VERSION)/' | sed 's/pns/$(E2E_EXECUTOR)/' > dist/postgres.yaml
 
@@ -316,7 +325,7 @@ test/e2e/manifests/no-db.yaml: $(MANIFESTS) $(E2E_MANIFESTS)
 	# Create no DB e2e manifests
 	kustomize build --load_restrictor=LoadRestrictionsNone test/e2e/manifests/no-db | ./hack/auto-gen-msg.sh > test/e2e/manifests/no-db.yaml
 
-dist/no-db.yaml: test/e2e/manifests/no-db.yaml dist/VERSION
+dist/no-db.yaml: test/e2e/manifests/no-db.yaml $(VERSION_FILE)
 	# Create no DB e2e manifests
 	# We additionlly disable ALWAY_OFFLOAD_NODE_STATUS
 	cat test/e2e/manifests/no-db.yaml | sed 's/:latest/:$(VERSION)/' | sed 's/pns/$(E2E_EXECUTOR)/' | sed 's/"true"/"false"/' > dist/no-db.yaml
@@ -325,7 +334,7 @@ test/e2e/manifests/mysql.yaml: $(MANIFESTS) $(E2E_MANIFESTS)
 	# Create MySQL e2e manifests
 	kustomize build --load_restrictor=LoadRestrictionsNone test/e2e/manifests/mysql | ./hack/auto-gen-msg.sh > test/e2e/manifests/mysql.yaml
 
-dist/mysql.yaml: test/e2e/manifests/mysql.yaml dist/VERSION
+dist/mysql.yaml: test/e2e/manifests/mysql.yaml $(VERSION_FILE)
 	# Create MySQL e2e manifests
 	cat test/e2e/manifests/mysql.yaml | sed 's/:latest/:$(VERSION)/' | sed 's/pns/$(E2E_EXECUTOR)/' > dist/mysql.yaml
 
@@ -454,9 +463,15 @@ $(HOME)/go/bin/swagger:
 	go get github.com/go-swagger/go-swagger/cmd/swagger
 	$(call restore_go_mod)
 
-api/openapi-spec/swagger.json: $(HOME)/go/bin/swagger $(SWAGGER_FILES) dist/MANIFESTS_VERSION hack/swaggify.sh
+.PHONY: swagger
+swagger: api/openapi-spec/swagger.json
+
+api/openapi-spec/swagger.json: $(HOME)/go/bin/swagger $(SWAGGER_FILES) $(MANIFEST_VERSION_FILE) hack/swaggify.sh
 	swagger mixin -c 412 $(SWAGGER_FILES) | sed 's/VERSION/$(MANIFESTS_VERSION)/' | ./hack/swaggify.sh > api/openapi-spec/swagger.json
 
+.PHONY: docs
+docs: swagger
+
 # pre-push
 
 .PHONY: pre-commit