From 70629ca20c1af37662c86a68ccbe0eebb51fca0d Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Fri, 13 Oct 2023 14:25:54 +0000 Subject: [PATCH] switch back to azure cni --- templates/test/ci/cluster-template-prow-aks.yaml | 1 - templates/test/ci/prow-aks/kustomization.yaml | 1 - templates/test/ci/prow-aks/patches/byo-cni.yaml | 7 ------- 3 files changed, 9 deletions(-) delete mode 100644 templates/test/ci/prow-aks/patches/byo-cni.yaml diff --git a/templates/test/ci/cluster-template-prow-aks.yaml b/templates/test/ci/cluster-template-prow-aks.yaml index 39ad31729cd..e633c9302aa 100644 --- a/templates/test/ci/cluster-template-prow-aks.yaml +++ b/templates/test/ci/cluster-template-prow-aks.yaml @@ -39,7 +39,6 @@ spec: kind: AzureClusterIdentity name: ${CLUSTER_IDENTITY_NAME} location: ${AZURE_LOCATION} - networkPlugin: none resourceGroupName: ${AZURE_RESOURCE_GROUP:=${CLUSTER_NAME}} sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""} subscriptionID: ${AZURE_SUBSCRIPTION_ID} diff --git a/templates/test/ci/prow-aks/kustomization.yaml b/templates/test/ci/prow-aks/kustomization.yaml index 22ab6af68d6..da179616259 100644 --- a/templates/test/ci/prow-aks/kustomization.yaml +++ b/templates/test/ci/prow-aks/kustomization.yaml @@ -9,5 +9,4 @@ patchesStrategicMerge: - patches/aks-pool0.yaml - patches/aks-pool1.yaml - patches/addons.yaml - - patches/byo-cni.yaml - ../patches/windows-containerd-labels.yaml diff --git a/templates/test/ci/prow-aks/patches/byo-cni.yaml b/templates/test/ci/prow-aks/patches/byo-cni.yaml deleted file mode 100644 index 1e4e8b1db1c..00000000000 --- a/templates/test/ci/prow-aks/patches/byo-cni.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 -kind: AzureManagedControlPlane -metadata: - name: ${CLUSTER_NAME} - namespace: default -spec: - networkPlugin: none