Fix crs-cni label for templates

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

templates/cluster-template-kube-vip-crs-cni.yaml

@@ -59,7 +59,7 @@ apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   labels:
-    cni: ${CLUSTER_NAME}-kube-vip
+    cni: ${CLUSTER_NAME}-crs-cni
   name: ${CLUSTER_NAME}
 spec:
   clusterNetwork:

templates/cluster-template-kube-vip.yaml

@@ -39,8 +39,6 @@ spec:
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
-  labels:
-    cni: ${CLUSTER_NAME}-kube-vip
   name: ${CLUSTER_NAME}
 spec:
   clusterNetwork:

templates/experimental-kube-vip-crs-cni/kustomization.yaml

@@ -4,3 +4,13 @@ kind: Kustomization
 resources:
 - ../experimental-kube-vip
 - ../bases/crs-cni.yaml
+patches:
+- patch: |-
+    kind: Cluster
+    apiVersion: cluster.x-k8s.io/v1beta1
+    metadata:
+      name: not-used
+      labels:
+        cni: "${CLUSTER_NAME}-crs-cni"
+  target:
+    kind: Cluster

templates/experimental-kube-vip/kustomization.yaml

@@ -4,15 +4,6 @@ kind: Kustomization
 resources:
 - ../cluster-template.yaml
 patches:
-- patch: |-
-    kind: Cluster
-    apiVersion: cluster.x-k8s.io/v1beta1
-    metadata:
-      name: not-used
-      labels:
-        cni: "${CLUSTER_NAME}-kube-vip"
-  target:
-    kind: Cluster
 - patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: PacketCluster