ASOAPI: add e2e test

kubernetes-sigs · Apr 30, 2024 · 38b9def · 38b9def
1 parent cef502c
commit 38b9def
Show file tree

Hide file tree

Showing 14 changed files with 439 additions and 68 deletions.
diff --git a/templates/cluster-template-aks-aso-clusterclass.yaml b/templates/cluster-template-aks-aso-clusterclass.yaml
diff --git a/templates/cluster-template-aks-aso.yaml b/templates/cluster-template-aks-aso.yaml
diff --git a/templates/flavors/aks-aso-clusterclass/clusterclass.yaml b/templates/flavors/aks-aso-clusterclass/clusterclass.yaml
@@ -94,6 +94,8 @@ spec:
                   type: SystemAssigned
                 servicePrincipalProfile:
                   clientId: msi
+                networkProfile:
+                  networkPlugin: azure
                 operatorSpec:
                   secrets:
                     adminCredentials:

diff --git a/templates/flavors/aks-aso/cluster-template.yaml b/templates/flavors/aks-aso/cluster-template.yaml
@@ -36,6 +36,8 @@ spec:
         type: SystemAssigned
       servicePrincipalProfile:
         clientId: msi
+      networkProfile:
+        networkPlugin: azure
       operatorSpec:
         secrets:
           adminCredentials:

diff --git a/templates/test/ci/cluster-template-prow-aks-aso.yaml b/templates/test/ci/cluster-template-prow-aks-aso.yaml
diff --git a/templates/test/ci/prow-aks-aso/kustomization.yaml b/templates/test/ci/prow-aks-aso/kustomization.yaml
@@ -0,0 +1,29 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: default
+resources:
+  - ../../../flavors/aks-aso
+  - patches/aks-pool2.yaml
+
+patches:
+  - patch: |-
+      - op: test
+        path: /spec/resources/0/kind
+        value: ResourceGroup
+      - op: replace
+        path: /spec/resources/0/spec/tags
+        value:
+          jobName: ${JOB_NAME}
+          creationTimestamp: ${TIMESTAMP}
+          buildProvenance: ${BUILD_PROVENANCE}
+    target:
+      kind: AzureASOManagedCluster
+  - patch: |-
+      - op: test
+        path: /spec/resources/0/kind
+        value: ManagedClustersAgentPool
+      - op: replace
+        path: /spec/resources/0/spec/vmSize
+        value: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
+    target:
+      kind: AzureASOManagedMachinePool
diff --git a/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml b/templates/test/ci/prow-aks-aso/patches/aks-pool2.yaml
@@ -0,0 +1,40 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachinePool
+metadata:
+  name: "${CLUSTER_NAME}-pool2"
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  replicas: 1
+  template:
+    metadata: {}
+    spec:
+      bootstrap:
+        dataSecretName: ""
+      clusterName: "${CLUSTER_NAME}"
+      infrastructureRef:
+        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
+metadata:
+  name: "${CLUSTER_NAME}-pool2"
+spec:
+  resources:
+  - apiVersion: "containerservice.azure.com/v1api20231001"
+    kind: ManagedClustersAgentPool
+    metadata:
+      name: ${CLUSTER_NAME}-pool2
+      annotations:
+        serviceoperator.azure.com/credential-from: ${ASO_CREDENTIAL_SECRET_NAME}
+    spec:
+      azureName: pool2
+      owner:
+        name: ${CLUSTER_NAME}
+      mode: User
+      type: VirtualMachineScaleSets
+      vmSize: "${AZURE_AKS_NODE_MACHINE_TYPE:=Standard_D2s_v3}"
+      osType: Windows
+      count: 1