From 6d88c3408e1c3cd72bca0b17d2047085334e0450 Mon Sep 17 00:00:00 2001
From: Cecile Robert-Michon <cerobert@microsoft.com>
Date: Thu, 7 Jul 2022 13:40:09 -0700
Subject: [PATCH] Fix Cluster labels in OOT cloud provider templates

Co-Authored-By: Mark Rossetti <18291632+marosset@users.noreply.github.com>
---
 templates/cluster-template-external-cloud-provider.yaml   | 1 -
 .../patches/external-cloud-provider.yaml                  | 8 --------
 ...-template-prow-external-cloud-provider-ci-version.yaml | 3 +--
 .../ci/cluster-template-prow-external-cloud-provider.yaml | 1 -
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/templates/cluster-template-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.yaml
index be5346109d0..7044f9a7320 100644
--- a/templates/cluster-template-external-cloud-provider.yaml
+++ b/templates/cluster-template-external-cloud-provider.yaml
@@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    ccm: external
     cni: calico
   name: ${CLUSTER_NAME}
   namespace: default
diff --git a/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml b/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml
index daf38ab612c..89af6cd5130 100644
--- a/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml
+++ b/templates/flavors/external-cloud-provider/patches/external-cloud-provider.yaml
@@ -1,12 +1,4 @@
 ---
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: Cluster
-metadata:
-  name: ${CLUSTER_NAME}
-  labels:
-    cni: "calico"
-    ccm: "external"
----
 kind: KubeadmControlPlane
 apiVersion: controlplane.cluster.x-k8s.io/v1beta1
 metadata:
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
index 1422a223af6..e8fe2419981 100644
--- a/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
+++ b/templates/test/ci/cluster-template-prow-external-cloud-provider-ci-version.yaml
@@ -2,8 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    ccm: external
-    cni: calico
+    cni: ${CLUSTER_NAME}-calico
     containerd-logger: enabled
     csi-proxy: enabled
     metrics-server: enabled
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
index 0d1ff007773..03eeb3e1bad 100644
--- a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
+++ b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
@@ -2,7 +2,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    ccm: external
     cni: ${CLUSTER_NAME}-calico
   name: ${CLUSTER_NAME}
   namespace: default