From fd1b69a40a6785421e00edeab3fb8fc24a51a8f1 Mon Sep 17 00:00:00 2001
From: willie-yao <williamyao@microsoft.com>
Date: Wed, 4 Oct 2023 23:44:09 +0000
Subject: [PATCH] Fix regular cc test

---
 .../ci/cluster-template-prow-topology.yaml    | 81 -------------------
 .../test/ci/prow-topology/kustomization.yaml  |  1 -
 2 files changed, 82 deletions(-)

diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml
index c38228833cb..2236c297053 100644
--- a/templates/test/ci/cluster-template-prow-topology.yaml
+++ b/templates/test/ci/cluster-template-prow-topology.yaml
@@ -51,87 +51,6 @@ spec:
         name: md-win
         replicas: ${WINDOWS_WORKER_MACHINE_COUNT:-0}
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: ClusterClass
-metadata:
-  name: ${CLUSTER_CLASS_NAME}
-  namespace: default
-spec:
-  controlPlane:
-    machineInfrastructure:
-      ref:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-        kind: AzureMachineTemplate
-        name: ${CLUSTER_NAME}-control-plane
-    ref:
-      apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-      kind: KubeadmControlPlaneTemplate
-      name: ${CLUSTER_NAME}-control-plane
-  infrastructure:
-    ref:
-      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-      kind: AzureClusterTemplate
-      name: ${CLUSTER_NAME}-azure-cluster
-  patches:
-  - definitions:
-    - jsonPatches:
-      - op: add
-        path: /spec/template/spec/kubeadmConfigSpec/clusterConfiguration/controllerManager/extraArgs/cluster-name
-        valueFrom:
-          variable: builtin.cluster.name
-      - op: replace
-        path: /spec/template/spec/kubeadmConfigSpec/files
-        valueFrom:
-          template: |
-            - contentFrom:
-                secret:
-                  key: control-plane-azure.json
-                  name: "{{ .builtin.controlPlane.machineTemplate.infrastructureRef.name }}-azure-json"
-              owner: root:root
-              path: /etc/kubernetes/azure.json
-              permissions: "0644"
-      selector:
-        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-        kind: KubeadmControlPlaneTemplate
-        matchResources:
-          controlPlane: true
-    name: controlPlaneAzureJsonSecretName
-  - definitions:
-    - jsonPatches:
-      - op: replace
-        path: /spec/template/spec/files
-        valueFrom:
-          template: |
-            - contentFrom:
-                secret:
-                  key: worker-node-azure.json
-                  name: "{{ .builtin.machineDeployment.infrastructureRef.name }}-azure-json"
-              owner: root:root
-              path: /etc/kubernetes/azure.json
-              permissions: "0644"
-      selector:
-        apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-        kind: KubeadmConfigTemplate
-        matchResources:
-          machineDeploymentClass:
-            names:
-            - ${CLUSTER_NAME}-worker
-    name: workerAzureJsonSecretName
-  workers:
-    machineDeployments:
-    - class: ${CLUSTER_NAME}-worker
-      template:
-        bootstrap:
-          ref:
-            apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-            kind: KubeadmConfigTemplate
-            name: ${CLUSTER_NAME}-md-0
-        infrastructure:
-          ref:
-            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
-            kind: AzureMachineTemplate
-            name: ${CLUSTER_NAME}-md-0
----
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
 metadata:
diff --git a/templates/test/ci/prow-topology/kustomization.yaml b/templates/test/ci/prow-topology/kustomization.yaml
index e294d8d9013..c412c508d08 100644
--- a/templates/test/ci/prow-topology/kustomization.yaml
+++ b/templates/test/ci/prow-topology/kustomization.yaml
@@ -3,7 +3,6 @@ kind: Kustomization
 namespace: default
 resources:
   - ../../../flavors/clusterclass-cluster/cluster.yaml
-  - ../../../flavors/clusterclass/clusterclass.yaml
   - cni-resource-set.yaml
   - ../../../addons/windows/csi-proxy/csi-proxy-resource-set.yaml
 patchesStrategicMerge: