Skip to content

Commit d817ab3

Browse files
authored
Merge pull request #4791 from nojnhuh/v2-e2e
ASOAPI: add e2e test
2 parents cef502c + 38b9def commit d817ab3

14 files changed

+439
-68
lines changed

templates/cluster-template-aks-aso-clusterclass.yaml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/cluster-template-aks-aso.yaml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/flavors/aks-aso-clusterclass/clusterclass.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ spec:
9494
type: SystemAssigned
9595
servicePrincipalProfile:
9696
clientId: msi
97+
networkProfile:
98+
networkPlugin: azure
9799
operatorSpec:
98100
secrets:
99101
adminCredentials:

templates/flavors/aks-aso/cluster-template.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ spec:
3636
type: SystemAssigned
3737
servicePrincipalProfile:
3838
clientId: msi
39+
networkProfile:
40+
networkPlugin: azure
3941
operatorSpec:
4042
secrets:
4143
adminCredentials:

templates/test/ci/cluster-template-prow-aks-aso.yaml

Lines changed: 197 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: default
4+
resources:
5+
- ../../../flavors/aks-aso
6+
- patches/aks-pool2.yaml
7+
8+
patches:
9+
- patch: |-
10+
- op: test
11+
path: /spec/resources/0/kind
12+
value: ResourceGroup
13+
- op: replace
14+
path: /spec/resources/0/spec/tags
15+
value:
16+
jobName: ${JOB_NAME}
17+
creationTimestamp: ${TIMESTAMP}
18+
buildProvenance: ${BUILD_PROVENANCE}
19+
target:
20+
kind: AzureASOManagedCluster
21+
- patch: |-
22+
- op: test
23+
path: /spec/resources/0/kind
24+
value: ManagedClustersAgentPool
25+
- op: replace
26+
path: /spec/resources/0/spec/vmSize
27+
value: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
28+
target:
29+
kind: AzureASOManagedMachinePool
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
apiVersion: cluster.x-k8s.io/v1beta1
2+
kind: MachinePool
3+
metadata:
4+
name: "${CLUSTER_NAME}-pool2"
5+
spec:
6+
clusterName: "${CLUSTER_NAME}"
7+
replicas: 1
8+
template:
9+
metadata: {}
10+
spec:
11+
bootstrap:
12+
dataSecretName: ""
13+
clusterName: "${CLUSTER_NAME}"
14+
infrastructureRef:
15+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
16+
kind: AzureASOManagedMachinePool
17+
name: "${CLUSTER_NAME}-pool2"
18+
version: "${KUBERNETES_VERSION}"
19+
---
20+
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
21+
kind: AzureASOManagedMachinePool
22+
metadata:
23+
name: "${CLUSTER_NAME}-pool2"
24+
spec:
25+
resources:
26+
- apiVersion: "containerservice.azure.com/v1api20231001"
27+
kind: ManagedClustersAgentPool
28+
metadata:
29+
name: ${CLUSTER_NAME}-pool2
30+
annotations:
31+
serviceoperator.azure.com/credential-from: ${ASO_CREDENTIAL_SECRET_NAME}
32+
spec:
33+
azureName: pool2
34+
owner:
35+
name: ${CLUSTER_NAME}
36+
mode: User
37+
type: VirtualMachineScaleSets
38+
vmSize: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
39+
osType: Windows
40+
count: 1

0 commit comments

Comments
 (0)