diff --git a/e2e/fixtures/confidential_container_pod.yml b/e2e/fixtures/confidential_container_pod.yml index 764a9ff0..6b19f803 100644 --- a/e2e/fixtures/confidential_container_pod.yml +++ b/e2e/fixtures/confidential_container_pod.yml @@ -8,7 +8,7 @@ metadata: spec: restartPolicy: Always containers: - - image: docker.io/kengordon/parmasimple:latest + - image: mcr.microsoft.com/aci/aci-confidential-helloworld:v1 imagePullPolicy: Always name: e2etest-conf-container resources: diff --git a/e2e/fixtures/csi-driver.yml b/e2e/fixtures/csi-driver.yml index e7a434e7..ab46eca7 100644 --- a/e2e/fixtures/csi-driver.yml +++ b/e2e/fixtures/csi-driver.yml @@ -20,7 +20,7 @@ spec: - containerPort: 80 name: http protocol: TCP - - image: busybox + - image: mcr.microsoft.com/cbl-mariner/busybox:1.35 name: busybox imagePullPolicy: Always command: [ diff --git a/e2e/fixtures/hpa.yml b/e2e/fixtures/hpa.yml index 6f29161b..adc983d7 100644 --- a/e2e/fixtures/hpa.yml +++ b/e2e/fixtures/hpa.yml @@ -20,7 +20,7 @@ spec: - containerPort: 443 name: https protocol: TCP - - image: busybox + - image: mcr.microsoft.com/cbl-mariner/busybox:1.35 name: busybox imagePullPolicy: Always command: [ diff --git a/e2e/fixtures/initcontainers_ordertest_pod.yml b/e2e/fixtures/initcontainers_ordertest_pod.yml index 93c04260..fe603d8b 100644 --- a/e2e/fixtures/initcontainers_ordertest_pod.yml +++ b/e2e/fixtures/initcontainers_ordertest_pod.yml @@ -6,14 +6,14 @@ metadata: spec: nodeName: vk-aci-test-aks initContainers: - - image: alpine + - image: mcr.microsoft.com/mirror/docker/library/alpine:3.16 name: init-container-01 command: [ "/bin/sh" ] args: [ "-c", "echo Hi from init-container-01 >> /mnt/azure/newfile.txt" ] volumeMounts: - name: azure mountPath: /mnt/azure - - image: alpine + - image: mcr.microsoft.com/mirror/docker/library/alpine:3.16 name: init-container-02 command: [ "/bin/sh" ] args: [ "-c", "echo Hi from init-container-02 >> /mnt/azure/newfile.txt" ] @@ -21,7 +21,7 @@ spec: - name: azure mountPath: /mnt/azure containers: - - image: alpine + - image: mcr.microsoft.com/mirror/docker/library/alpine:3.16 imagePullPolicy: Always name: container command: [ diff --git a/e2e/fixtures/multi-volume.yml b/e2e/fixtures/multi-volume.yml index 5ab6ed38..38182e78 100644 --- a/e2e/fixtures/multi-volume.yml +++ b/e2e/fixtures/multi-volume.yml @@ -6,7 +6,7 @@ metadata: spec: nodeName: vk-aci-test-aks containers: - - image: busybox + - image: mcr.microsoft.com/cbl-mariner/busybox:1.35 imagePullPolicy: Always name: busybox command: [ diff --git a/hack/e2e/aks-addon.sh b/hack/e2e/aks-addon.sh index 89554a6a..477cecc1 100755 --- a/hack/e2e/aks-addon.sh +++ b/hack/e2e/aks-addon.sh @@ -20,7 +20,7 @@ if [ "$PR_RAND" = "" ]; then fi : "${RESOURCE_GROUP:=aks-addon-aci-test-$RANDOM_NUM}" -: "${LOCATION:=eastus2}" +: "${LOCATION:=eastus2euap}" : "${CLUSTER_NAME:=${RESOURCE_GROUP}}" : "${NODE_COUNT:=1}" : "${CHART_NAME:=aks-addon--test}" diff --git a/hack/e2e/aks.sh b/hack/e2e/aks.sh index 49d637a6..ffaa0d2c 100755 --- a/hack/e2e/aks.sh +++ b/hack/e2e/aks.sh @@ -35,6 +35,7 @@ fi : "${CLUSTER_SUBNET_RANGE=10.240.0.0/16}" : "${ACI_SUBNET_RANGE=10.241.0.0/16}" : "${VNET_NAME=myAKSVNet}" +: "${NSG_NAME=myAKSNSG}" : "${CLUSTER_SUBNET_NAME=myAKSSubnet}" : "${ACI_SUBNET_NAME=myACISubnet}" : "${ACR_NAME=vkacr$RANDOM_NUM}" @@ -96,10 +97,14 @@ az network vnet create \ --subnet-name $CLUSTER_SUBNET_NAME \ --subnet-prefix $CLUSTER_SUBNET_RANGE +az network nsg create \ + --resource-group $RESOURCE_GROUP \ + --name $NSG_NAME + aci_subnet_id="$(az network vnet subnet create \ --resource-group $RESOURCE_GROUP \ --vnet-name $VNET_NAME \ - --network-security-group $VNET_NAME-nsg \ + --network-security-group $NSG_NAME \ --name $ACI_SUBNET_NAME \ --address-prefix $ACI_SUBNET_RANGE \ --query id -o tsv)" @@ -122,7 +127,7 @@ az aks create \ -g "$RESOURCE_GROUP" \ -l "$LOCATION" \ -c "$NODE_COUNT" \ - --node-vm-size standard_d8_v3 \ + --node-vm-size standard_d8s_v3 \ -n "$CLUSTER_NAME" \ --network-plugin azure \ --vnet-subnet-id "$aks_subnet_id" \ @@ -138,7 +143,7 @@ az aks create \ -g "$RESOURCE_GROUP" \ -l "$LOCATION" \ -c "$NODE_COUNT" \ - --node-vm-size standard_d8_v3 \ + --node-vm-size standard_d8s_v3 \ -n "$CLUSTER_NAME" \ --network-plugin azure \ --vnet-subnet-id "$aks_subnet_id" \