Merge pull request #2228 from thomasferrandiz/fix-chart-release

Fix release workflow

Author: thomasferrandiz

.github/workflows/release.yml

@@ -137,6 +137,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
 
+      - name: set tag
+        run: echo "GIT_TAG=$(git describe --tags --always)" >> $GITHUB_ENV
+
       - name: Set up Go 1.x
         uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b #v5.4.0
         with:
@@ -151,10 +154,10 @@ jobs:
       - name: Build release artifacts
         run: make release
 
-      - name: Upload release files
+      - name: Upload flannel binaries to the release page
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{ env.GIT_TAG }} dist/flannel* dist/kube-flannel.yml dist/kube-flannel-psp.yml
+        run: gh release upload ${{ env.GIT_TAG }} dist/flannel* 
 
   publish-chart:
     permissions:
@@ -173,13 +176,16 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
 
+      - name: set tag
+        run: echo "GIT_TAG=$(git describe --tags --always)" >> $GITHUB_ENV
+
       - name: Package chart
-        run: make release-chart release-helm
+        run: make release-manifest release-helm
 
-      - name: Upload chart with release files
+      - name: Upload chart and manifests to the release page
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{ env.GIT_TAG }} dist/flannel.tgz
+        run: gh release upload ${{ env.GIT_TAG }} dist/flannel.tgz dist/kube-flannel.yml dist/kube-flannel-psp.yml
 
       - name: Setup Pages
         uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d #v4.0.0

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test unit-test e2e-test deps cover gofmt gofmt-fix license-check clean tar.gz release buildx-create-builder build-multi-arch release-chart release-helm
+.PHONY: test unit-test e2e-test deps cover gofmt gofmt-fix license-check clean tar.gz release buildx-create-builder build-multi-arch release-manifest release-helm
 
 # Registry used for publishing images
 REGISTRY?=quay.io/coreos/flannel
@@ -164,7 +164,7 @@ release: tar.gz dist/qemu-s390x-static dist/qemu-ppc64le-static dist/qemu-arm64-
 	@echo "Add all flanneld-* and *.tar.gz files from dist/ to the Github release"
 	@echo "Use make docker-push-all to push the images to a registry"
 
-release-chart:
+release-manifest:
 	sed -i 's/^  newTag: .*/  newTag: $(TAG)/' Documentation/kustomization/kube-flannel/kustomization.yaml
 	kubectl kustomize ./Documentation/kustomization/kube-flannel/ > dist/kube-flannel.yml
 	sed -i 's/^  newTag: .*/  newTag: $(TAG)/' Documentation/kustomization/kube-flannel-psp/kustomization.yaml