diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 735c41c1..984288dc 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -2,6 +2,7 @@ name: Create release on: pull_request: branches: + - master - release-**-** types: [ closed ] @@ -113,4 +114,4 @@ jobs: uses: ./.github/workflows/publish-init-container-image.yml with: registry: ${{ needs.export-registry.outputs.registry }} - init_container_version: ${{ needs.check-tag.outputs.init-tag }} \ No newline at end of file + init_container_version: ${{ needs.check-tag.outputs.init-tag }} diff --git a/Makefile b/Makefile index d6b6516a..30af12bf 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ TEST_CREDENTIALS_JSON ?= $(TEST_CREDENTIALS_DIR)/credentials.json TEST_LOGANALYTICS_JSON ?= $(TEST_CREDENTIALS_DIR)/loganalytics.json export TEST_CREDENTIALS_JSON TEST_LOGANALYTICS_JSON TEST_AKS_CREDENTIALS_JSON -VERSION ?= v1.6.2 +VERSION ?= v1.6.1 REGISTRY ?= ghcr.io IMG_NAME ?= virtual-kubelet INIT_IMG_NAME ?= init-validation @@ -35,7 +35,7 @@ E2E_CLUSTER_NAME := $(CLUSTER_NAME) OUTPUT_TYPE ?= type=docker BUILDPLATFORM ?= linux/amd64 IMG_TAG ?= $(subst v,,$(VERSION)) -INIT_IMG_TAG ?= v0.3.0 +INIT_IMG_TAG ?= v0.2.0 BUILD_DATE ?= $(shell date '+%Y-%m-%dT%H:%M:%S') VERSION_FLAGS := "-ldflags=-X main.buildVersion=$(IMG_TAG) -X main.buildTime=$(BUILD_DATE)"