fix: wrong image name in release manifests (#320)

Signed-off-by: Xunzhuo <[email protected]>

Signed-off-by: Xunzhuo <[email protected]>

.github/workflows/release.yaml

@@ -46,7 +46,9 @@ jobs:
         run: make image.push.multiarch TAG=${EG_TAG_VERSION} IMAGE_NAME=gateway PLATFORMS="linux_amd64 linux_arm64"
 
       - name: Generate Release Manifests
-        run: make release-manifests
+        env:
+          EG_TAG_VERSION: ${{ steps.tag_env.outputs.version}}
+        run: make release-manifests TAG=${EG_TAG_VERSION}
 
       - name: Upload Release Manifests
         uses: softprops/action-gh-release@v1

tools/make/common.mk

@@ -30,12 +30,6 @@ ifeq ($(origin OUTPUT_DIR),undefined)
 OUTPUT_DIR := $(ROOT_DIR)/bin
 endif
 
-# Set the version number. you should not need to do this
-# for the majority of scenarios.
-ifeq ($(origin VERSION), undefined)
-VERSION := $(shell git describe --abbrev=0 --dirty --always --tags | sed 's/-/./g')
-endif
-
 # REV is the short git sha of latest commit.
 REV=$(shell git rev-parse --short HEAD)
 

tools/make/golang.mk

@@ -19,7 +19,7 @@ go.build.%:
 	$(eval PLATFORM := $(word 1,$(subst ., ,$*)))
 	$(eval OS := $(word 1,$(subst _, ,$(PLATFORM))))
 	$(eval ARCH := $(word 2,$(subst _, ,$(PLATFORM))))
-	@$(call log, "Building binary $(COMMAND) with commit $(REV) in version $(VERSION) for $(OS) $(ARCH)")
+	@$(call log, "Building binary $(COMMAND) with commit $(REV) for $(OS) $(ARCH)")
 	CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -o $(OUTPUT_DIR)/$(OS)/$(ARCH)/$(COMMAND) $(ROOT_PACKAGE)/cmd/$(COMMAND)
 
 # Build the envoy-gateway binaries in the hosted platforms.

tools/make/kube.mk

@@ -69,4 +69,4 @@ delete-cluster: $(tools/kind) ## Delete kind cluster.
 
 .PHONY: release-manifests
 release-manifests: $(tools/kustomize)
-	tools/hack/release-manifests.sh $(GATEWAY_API_VERSION) $(VERSION)
+	tools/hack/release-manifests.sh $(GATEWAY_API_VERSION) $(TAG)