Merge pull request #153 from adam-cattermole/fix-release-workflow

Kuadrant · Oct 24, 2023 · 57023d1 · 57023d1
2 parents aee73cf + f5ff784
commit 57023d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -49,12 +49,13 @@ jobs:
         VERSION=${{ github.event.inputs.operatorVersion }} \
         AUTHORINO_VERSION=${{ github.event.inputs.authorinoVersion }} \
         CHANNELS=${{ github.event.inputs.channels }} \
+        DEFAULT_CHANNEL=${{ github.event.inputs.channels }} \
         make prepare-release
     - name: Commit and push
       run: |
         git config --global user.name "github-actions[bot]"
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
-        git commit -m "Prepared release v${{ github.event.inputs.operatorVersion }}" -a
+        git add -A && git commit -m "Prepared release v${{ github.event.inputs.operatorVersion }}"
         git push origin release-v${{ github.event.inputs.operatorVersion }}
     - name: Create release
       uses: softprops/action-gh-release@v1

diff --git a/Makefile b/Makefile
@@ -77,8 +77,10 @@ SHELL = /usr/bin/env bash -o pipefail
 AUTHORINO_VERSION ?= latest
 ifeq (latest,$(AUTHORINO_VERSION))
 AUTHORINO_BRANCH = main
+AUTHORINO_IMAGE_TAG = latest
 else
 AUTHORINO_BRANCH = v$(AUTHORINO_VERSION)
+AUTHORINO_IMAGE_TAG = v$(AUTHORINO_VERSION)
 endif
 
 AUTHORINO_IMAGE_FILE ?= authorino_image
@@ -140,7 +142,7 @@ manifests: controller-gen kustomize authorino-manifests ## Generate WebhookConfi
 
 .PHONY: authorino-manifests
 authorino-manifests: export AUTHORINO_GITREF := $(AUTHORINO_BRANCH)
-authorino-manifests: export AUTHORINO_VERSION := $(AUTHORINO_VERSION)
+authorino-manifests: export AUTHORINO_IMAGE_TAG := $(AUTHORINO_IMAGE_TAG)
 authorino-manifests: ## Update authorino manifests.
 	envsubst \
         < config/authorino/kustomization.template.yaml \
@@ -266,7 +268,7 @@ prepare-release:
 	@if [ "$(AUTHORINO_VERSION)" = "latest" ]; then\
 		[ ! -e "$(AUTHORINO_IMAGE_FILE)" ] || rm $(AUTHORINO_IMAGE_FILE); \
 	else \
-	    echo quay.io/kuadrant/authorino:v$(AUTHORINO_VERSION) > $(AUTHORINO_IMAGE_FILE); \
+	    echo quay.io/kuadrant/authorino:$(AUTHORINO_IMAGE_TAG) > $(AUTHORINO_IMAGE_FILE); \
 	fi
 	$(MAKE) fix-csv-replaces
 

diff --git a/config/authorino/kustomization.template.yaml b/config/authorino/kustomization.template.yaml
@@ -9,7 +9,7 @@ resources:
 images:
 - name: AUTHORINO_IMAGE
   newName: quay.io/kuadrant/authorino
-  newTag: ${AUTHORINO_VERSION}
+  newTag: ${AUTHORINO_IMAGE_TAG}
 
 patchesStrategicMerge:
 - webhook/patches/webhook_in_authconfigs.yaml