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

align Azure e2e tests with backports #7214

Merged
merged 1 commit into from
Sep 5, 2024
Merged

align Azure e2e tests with backports #7214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cluster-autoscaler/cloudprovider/azure/test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARTIFACTS?=_artifacts

.PHONY: test-e2e
test-e2e: build-e2e
go run github.com/onsi/ginkgo/v2/ginkgo -v --trace --output-dir "$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" e2e -- \
go run github.com/onsi/ginkgo/v2/ginkgo --tags e2e -v --trace --output-dir "$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" e2e -- \
-resource-group="$$(KUBECONFIG= kubectl get managedclusters -n default -o jsonpath='{.items[0].status.nodeResourceGroup}')" \
-cluster-name="$$(KUBECONFIG= kubectl get cluster -n default -o jsonpath='{.items[0].metadata.name}')" \
-client-id="$$(KUBECONFIG= kubectl get userassignedidentities -n default -o jsonpath='{.items[0].status.clientId}')" \
Expand Down
2 changes: 2 additions & 0 deletions cluster-autoscaler/cloudprovider/azure/test/e2e/azure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build e2e
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This build tag ensures that the go test invocation on release branches that use GO111MODULE=off doesn't catch Azure e2e packages since they will not contain unit tests.


/*
Copyright 2024 The Kubernetes Authors.

Expand Down
2 changes: 2 additions & 0 deletions cluster-autoscaler/cloudprovider/azure/test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build e2e

/*
Copyright 2024 The Kubernetes Authors.

Expand Down
8 changes: 4 additions & 4 deletions .../cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ metadata:
name: ${CLUSTER_NAME}
namespace: default
spec:
version: ${KUBERNETES_VERSION}
resources:
- apiVersion: containerservice.azure.com/v1api20231001
kind: ManagedCluster
Expand All @@ -31,6 +30,7 @@ spec:
dnsPrefix: ${CLUSTER_NAME}
identity:
type: SystemAssigned
kubernetesVersion: "${KUBERNETES_VERSION}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving the Kubernetes version here allows us to use AKS MAJOR.MINOR versions where CAPI requires spec.version to be formatted as MAJOR.MINOR.PATCH. This allows us to automatically inherit new patch releases when they become available in AKS.

location: ${AZURE_LOCATION}
networkProfile:
networkPlugin: azure
Expand Down Expand Up @@ -142,7 +142,6 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: AzureASOManagedMachinePool
name: ${CLUSTER_NAME}-pool0
version: ${KUBERNETES_VERSION}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: AzureASOManagedMachinePool
Expand All @@ -164,6 +163,7 @@ spec:
name: ${CLUSTER_NAME}
type: VirtualMachineScaleSets
vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}
orchestratorVersion: "${KUBERNETES_VERSION}"
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachinePool
Expand All @@ -185,7 +185,6 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: AzureASOManagedMachinePool
name: ${CLUSTER_NAME}-pool1
version: ${KUBERNETES_VERSION}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: AzureASOManagedMachinePool
Expand All @@ -212,6 +211,7 @@ spec:
min: "1"
type: VirtualMachineScaleSets
vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}
orchestratorVersion: "${KUBERNETES_VERSION}"
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachinePool
Expand All @@ -233,7 +233,6 @@ spec:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: AzureASOManagedMachinePool
name: ${CLUSTER_NAME}-pool2
version: ${KUBERNETES_VERSION}
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: AzureASOManagedMachinePool
Expand Down Expand Up @@ -261,6 +260,7 @@ spec:
min: "1"
type: VirtualMachineScaleSets
vmSize: ${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}
orchestratorVersion: "${KUBERNETES_VERSION}"
---
apiVersion: v1
kind: Secret
Expand Down
Loading