Skip to content

Commit 6c1f9dc

Browse files
matthchrmatthchr
authored
chore: add e2e log improvements (#1592)
1 parent 98d5263 commit 6c1f9dc

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎.github/workflows/e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ on:
5656
- westus3
5757
- southcentralus
5858
- eastus
59-
- westus2 # This is staging in our sub
59+
- westus2
6060
k8s_version:
6161
type: choice
6262
description: "Kubernetes version ('default' = AKS default)"

‎Makefile-az.mk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ az-mkaks: az-mkacr ## Create test AKS cluster (with --vm-set-type AvailabilitySe
156156
EXIT_CODE=$$?; \
157157
if [ $$EXIT_CODE -eq 1 ]; then \
158158
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) --location $(AZURE_LOCATION) \
159-
--enable-managed-identity --node-count 3 --generate-ssh-keys --vm-set-type AvailabilitySet --output none \
159+
--enable-managed-identity --node-count 3 --generate-ssh-keys --vm-set-type AvailabilitySet \
160160
$(if $(AZURE_VM_SIZE),--node-vm-size $(AZURE_VM_SIZE)) \
161161
$(if $(K8S_VERSION),--kubernetes-version $(K8S_VERSION)) \
162162
--tags "make-command=az-mkaks"; \
@@ -171,7 +171,7 @@ az-mkaks-cniv1: az-mkacr ## Create test AKS cluster (with --network-plugin azure
171171
EXIT_CODE=$$?; \
172172
if [ $$EXIT_CODE -eq 1 ]; then \
173173
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
174-
--enable-managed-identity --node-count 3 --generate-ssh-keys --output none --network-plugin azure \
174+
--enable-managed-identity --node-count 3 --generate-ssh-keys --network-plugin azure \
175175
--enable-oidc-issuer --enable-workload-identity --nodepool-taints "CriticalAddonsOnly=true:NoSchedule" \
176176
$(if $(AZURE_VM_SIZE),--node-vm-size $(AZURE_VM_SIZE)) \
177177
$(if $(K8S_VERSION),--kubernetes-version $(K8S_VERSION)) \
@@ -187,7 +187,7 @@ az-mkaks-cilium: az-mkacr ## Create test AKS cluster (with --network-dataplane c
187187
EXIT_CODE=$$?; \
188188
if [ $$EXIT_CODE -eq 1 ]; then \
189189
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
190-
--enable-managed-identity --node-count 3 --generate-ssh-keys --output none \
190+
--enable-managed-identity --node-count 3 --generate-ssh-keys \
191191
--network-dataplane cilium --network-plugin azure --network-plugin-mode overlay \
192192
--enable-oidc-issuer --enable-workload-identity --nodepool-taints "CriticalAddonsOnly=true:NoSchedule" \
193193
$(if $(AZURE_VM_SIZE),--node-vm-size $(AZURE_VM_SIZE)) \
@@ -205,7 +205,7 @@ az-mkaks-cilium-userassigned: az-mkacr az-create-workload-msi ## Create test AKS
205205
if [ $$EXIT_CODE -eq 1 ]; then \
206206
KARPENTER_USER_ASSIGNED_IDENTITY_ID=$$(az identity show --resource-group $(AZURE_RESOURCE_GROUP) --name $(AZURE_KARPENTER_USER_ASSIGNED_IDENTITY_NAME) --query 'id' --output tsv); \
207207
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
208-
--assign-identity $$KARPENTER_USER_ASSIGNED_IDENTITY_ID --node-count 3 --generate-ssh-keys --output none --network-dataplane cilium --network-plugin azure --network-plugin-mode overlay \
208+
--assign-identity $$KARPENTER_USER_ASSIGNED_IDENTITY_ID --node-count 3 --generate-ssh-keys --network-dataplane cilium --network-plugin azure --network-plugin-mode overlay \
209209
--enable-oidc-issuer --enable-workload-identity --nodepool-taints "CriticalAddonsOnly=true:NoSchedule" \
210210
$(if $(AZURE_VM_SIZE),--node-vm-size $(AZURE_VM_SIZE),) \
211211
$(if $(K8S_VERSION),--kubernetes-version $(K8S_VERSION)) \
@@ -221,7 +221,7 @@ az-mkaks-overlay: az-mkacr ## Create test AKS cluster (with --network-plugin-mod
221221
EXIT_CODE=$$?; \
222222
if [ $$EXIT_CODE -eq 1 ]; then \
223223
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
224-
--enable-managed-identity --node-count 3 --generate-ssh-keys --output none \
224+
--enable-managed-identity --node-count 3 --generate-ssh-keys \
225225
--network-plugin azure --network-plugin-mode overlay \
226226
--enable-oidc-issuer --enable-workload-identity --nodepool-taints "CriticalAddonsOnly=true:NoSchedule" \
227227
$(if $(AZURE_VM_SIZE),--node-vm-size $(AZURE_VM_SIZE)) \
@@ -238,7 +238,7 @@ az-mkaks-perftest: az-mkacr ## Create test AKS cluster (with Azure Overlay, larg
238238
EXIT_CODE=$$?; \
239239
if [ $$EXIT_CODE -eq 1 ]; then \
240240
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
241-
--enable-managed-identity --node-count 2 --generate-ssh-keys --output none \
241+
--enable-managed-identity --node-count 2 --generate-ssh-keys \
242242
--network-plugin azure --network-plugin-mode overlay \
243243
--enable-oidc-issuer --enable-workload-identity --nodepool-taints "CriticalAddonsOnly=true:NoSchedule" \
244244
--node-vm-size $(if $(AZURE_VM_SIZE),$(AZURE_VM_SIZE),Standard_D16s_v6) --pod-cidr "10.128.0.0/11" \
@@ -261,7 +261,7 @@ az-mkaks-custom-vnet: az-mkacr az-mkvnet az-mksubnet ## Create test AKS cluster
261261
EXIT_CODE=$$?; \
262262
if [ $$EXIT_CODE -eq 1 ]; then \
263263
az aks create --name $(AZURE_CLUSTER_NAME) --resource-group $(AZURE_RESOURCE_GROUP) --attach-acr $(AZURE_ACR_NAME) \
264-
--enable-managed-identity --node-count 3 --generate-ssh-keys --output none \
264+
--enable-managed-identity --node-count 3 --generate-ssh-keys \
265265
--network-dataplane cilium --network-plugin azure --network-plugin-mode overlay \
266266
--enable-oidc-issuer --enable-workload-identity --nodepool-taints "CriticalAddonsOnly=true:NoSchedule" \
267267
$(if $(AZURE_VM_SIZE),--node-vm-size $(AZURE_VM_SIZE)) \

0 commit comments

Comments
 (0)