Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: changing aks version to default #570

Merged
merged 3 commits into from
Sep 21, 2023
Merged

test: changing aks version to default #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a77bfaa
changing aks version to default
smritidahal653 Sep 14, 2023
50cdec8
removing k8s hardcoded version
smritidahal653 Sep 14, 2023
9b746e3
getting rollout status
smritidahal653 Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ OUTPUT_TYPE ?= type=docker
BUILDPLATFORM ?= linux/amd64
IMG_TAG ?= $(subst v,,$(VERSION))
INIT_IMG_TAG ?= 0.2.0
K8S_VERSION ?= 1.24.10

BUILD_DATE ?= $(shell date '+%Y-%m-%dT%H:%M:%S')
VERSION_FLAGS := "-ldflags=-X main.buildVersion=$(IMG_TAG) -X main.buildTime=$(BUILD_DATE)"
Expand Down Expand Up @@ -106,7 +105,6 @@ e2e-test:
IMG_URL=$(REGISTRY) IMG_REPO=$(IMG_NAME) IMG_TAG=$(IMG_TAG) \
INIT_IMG_REPO=$(INIT_IMG_NAME) INIT_IMG_TAG=$(INIT_IMG_TAG) \
LOCATION=$(LOCATION) RESOURCE_GROUP=$(E2E_CLUSTER_NAME) \
K8S_VERSION=$(K8S_VERSION) \
$(AKS_E2E_SCRIPT) go test -timeout 60m -v ./e2e

.PHONY: aks-addon-e2e-test
Expand All @@ -115,7 +113,6 @@ aks-addon-e2e-test:
IMG_URL=$(REGISTRY) IMG_REPO=$(IMG_NAME) IMG_TAG=$(IMG_TAG) \
INIT_IMG_REPO=$(INIT_IMG_NAME) INIT_IMG_TAG=$(INIT_IMG_TAG) \
LOCATION=$(LOCATION) RESOURCE_GROUP=$(E2E_CLUSTER_NAME) \
K8S_VERSION=$(K8S_VERSION) \
$(AKS_ADDON_E2E_SCRIPT) go test -timeout 60m -v ./e2e

.PHONY: vet
Expand Down
12 changes: 8 additions & 4 deletions hack/e2e/aks-addon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ fi
: "${ACR_NAME=aksaddonacr$RANDOM_NUM}"
: "${CSI_DRIVER_STORAGE_ACCOUNT_NAME=aksaddonvk$RANDOM_NUM}"
: "${CSI_DRIVER_SHARE_NAME=vncsidriversharename}"
: "${K8S_VERSION:=1.24.10}"

error() {
echo "$@" >&2
Expand Down Expand Up @@ -113,7 +112,6 @@ cluster_subnet_id="$(az network vnet subnet show \
if [ "$E2E_TARGET" = "pr" ]; then
az aks create \
-g "$RESOURCE_GROUP" \
--kubernetes-version "$K8S_VERSION" \
-l "$LOCATION" \
-c "$NODE_COUNT" \
--node-vm-size standard_d8_v3 \
Expand All @@ -128,7 +126,6 @@ else

az aks create \
-g "$RESOURCE_GROUP" \
--kubernetes-version "$K8S_VERSION" \
-l "$LOCATION" \
-c "$NODE_COUNT" \
--node-vm-size standard_d8_v3 \
Expand Down Expand Up @@ -161,7 +158,14 @@ kubectl create configmap test-vars -n kube-system \

sed -e "s|TEST_INIT_IMAGE|$IMG_URL/$INIT_IMG_REPO:$INIT_IMG_TAG|g" -e "s|TEST_IMAGE|$IMG_URL/$IMG_REPO:$IMG_TAG|g" deploy/deployment.yaml | kubectl apply -n kube-system -f -

kubectl wait --for=condition=available deploy "virtual-kubelet-azure-aci" -n kube-system --timeout=300s
# Check deployment rollout status every 30 seconds (max 5 minutes) until complete.
ATTEMPTS=0
ROLLOUT_STATUS_CMD="kubectl rollout status deployment/virtual-kubelet-azure-aci -n kube-system"
until $ROLLOUT_STATUS_CMD || [ $ATTEMPTS -eq 10 ]; do
$ROLLOUT_STATUS_CMD
ATTEMPTS=$((attempts + 1))
sleep 30
done

while true; do
kubectl get node "$TEST_NODE_NAME" &> /dev/null && break
Expand Down
3 changes: 0 additions & 3 deletions hack/e2e/aks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ fi
: "${ACR_NAME=vkacr$RANDOM_NUM}"
: "${CSI_DRIVER_STORAGE_ACCOUNT_NAME=vkcsidrivers$RANDOM_NUM}"
: "${CSI_DRIVER_SHARE_NAME=vncsidriversharename}"
: "${K8S_VERSION:=1.24.10}"

error() {
echo "$@" >&2
Expand Down Expand Up @@ -120,7 +119,6 @@ node_identity_client_id="$(az identity create --name "${RESOURCE_GROUP}-aks-iden
if [ "$E2E_TARGET" = "pr" ]; then
az aks create \
-g "$RESOURCE_GROUP" \
--kubernetes-version "$K8S_VERSION" \
-l "$LOCATION" \
-c "$NODE_COUNT" \
--node-vm-size standard_d8_v3 \
Expand All @@ -137,7 +135,6 @@ else

az aks create \
-g "$RESOURCE_GROUP" \
--kubernetes-version "$K8S_VERSION" \
-l "$LOCATION" \
-c "$NODE_COUNT" \
--node-vm-size standard_d8_v3 \
Expand Down
Loading