From 35b362c0f458859d36c8e2372ee1c863014f1972 Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 14:29:31 -0700 Subject: [PATCH 1/3] fix --- Makefile | 4 ++-- charts/virtual-kubelet/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 37ca23f4..85934430 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 ?= 0.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)" diff --git a/charts/virtual-kubelet/values.yaml b/charts/virtual-kubelet/values.yaml index 2a825944..a0e1aac0 100644 --- a/charts/virtual-kubelet/values.yaml +++ b/charts/virtual-kubelet/values.yaml @@ -8,7 +8,7 @@ image: initImage: repository: mcr.microsoft.com name: oss/virtual-kubelet/init-validation - initTag: v0.3.0 + initTag: 0.3.0 pullPolicy: IfNotPresent namespace: vk-azure-aci From 65a871ec7640ee0e481176ca4722753379a7c4d4 Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 14:54:31 -0700 Subject: [PATCH 2/3] fix initTag helm variable in e2e scripts --- hack/e2e/aks-addon.sh | 2 +- hack/e2e/aks.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/e2e/aks-addon.sh b/hack/e2e/aks-addon.sh index 401cc830..97a46c74 100755 --- a/hack/e2e/aks-addon.sh +++ b/hack/e2e/aks-addon.sh @@ -185,7 +185,7 @@ helm install \ --set "image.name=${IMG_REPO}" \ --set "initImage.repository=${IMG_URL}" \ --set "initImage.name=${INIT_IMG_REPO}" \ - --set "initImage.tag=${INIT_IMG_TAG}" \ + --set "initImage.initTag=${INIT_IMG_TAG}" \ --set "nodeName=${TEST_WINDOWS_NODE_NAME}" \ --set "providers.azure.masterUri=$MASTER_URI" \ --set "providers.azure.managedIdentityID=$ACI_USER_IDENTITY" \ diff --git a/hack/e2e/aks.sh b/hack/e2e/aks.sh index dfb2459e..cd51adee 100755 --- a/hack/e2e/aks.sh +++ b/hack/e2e/aks.sh @@ -216,7 +216,7 @@ helm install \ --set "image.tag=${IMG_TAG}" \ --set "initImage.repository=${IMG_URL}" \ --set "initImage.name=${INIT_IMG_REPO}" \ - --set "initImage.tag=${INIT_IMG_TAG}" \ + --set "initImage.initTag=${INIT_IMG_TAG}" \ --set "nodeName=${TEST_WINDOWS_NODE_NAME}" \ --set "providers.azure.masterUri=$MASTER_URI" \ "$WIN_CHART_NAME" \ From 5da157fb614895954d2c2789e6a679d67d86c625 Mon Sep 17 00:00:00 2001 From: Smriti Dahal Date: Wed, 14 Aug 2024 14:57:11 -0700 Subject: [PATCH 3/3] fix --- hack/e2e/aks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/e2e/aks.sh b/hack/e2e/aks.sh index cd51adee..c353ee61 100755 --- a/hack/e2e/aks.sh +++ b/hack/e2e/aks.sh @@ -185,7 +185,7 @@ helm install \ --set "image.tag=${IMG_TAG}" \ --set "initImage.repository=${IMG_URL}" \ --set "initImage.name=${INIT_IMG_REPO}" \ - --set "initImage.tag=${INIT_IMG_TAG}" \ + --set "initImage.initTag=${INIT_IMG_TAG}" \ --set "nodeName=${TEST_NODE_NAME}" \ --set providers.azure.vnet.enabled=true \ --set "providers.azure.vnet.subnetName=$ACI_SUBNET_NAME" \