From dbb19e92888cbe722665bd647fe9b144d12e3154 Mon Sep 17 00:00:00 2001
From: Chen Lin <linch@vmware.com>
Date: Fri, 7 Apr 2023 08:15:49 +0000
Subject: [PATCH] Fix adc name and cluster selector

---
 .../overlays/overlay-akodeploymentconfig.yaml | 28 ++-----------------
 .../akooperator/akodeploymentconfig.yaml      |  5 +++-
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml b/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml
index e9cf9855d7..a26ed7f3dd 100644
--- a/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml
+++ b/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml
@@ -14,10 +14,6 @@ spec:
     #@overlay/match missing_ok=True
     clusterSelector:
         matchLabels: #@ json.decode(values.akoOperator.config.avi_labels)
-#@ end
-#@ if values.akoOperator.config.avi_controller_version != "":
-    #@overlay/match missing_ok=True
-    controllerVersion: #@ values.akoOperator.config.avi_controller_version
 #@ end
     cloudName: #@ values.akoOperator.config.avi_cloud_name
     serviceEngineGroup: #@ values.akoOperator.config.avi_service_engine_group
@@ -35,10 +31,6 @@ spec:
         name: #@ values.akoOperator.config.avi_control_plane_network
         cidr: #@ values.akoOperator.config.avi_control_plane_network_cidr
     extraConfigs:
-#@ if values.akoOperator.config.avi_cni_plugin:
-#@overlay/match missing_ok=True
-        cniPlugin: #@ values.akoOperator.config.avi_cni_plugin
-#@ end
         disableStaticRouteSync: #@ values.akoOperator.config.avi_disable_static_route_sync
         ingress:
             disableIngressClass: #@ values.akoOperator.config.avi_disable_ingress_class
@@ -72,10 +64,6 @@ spec:
     clusterSelector:
         matchLabels:
             cluster-role.tkg.tanzu.vmware.com/management: ""
-#@ if values.akoOperator.config.avi_controller_version != "":
-    #@overlay/match missing_ok=True
-    controllerVersion: #@ values.akoOperator.config.avi_controller_version
-#@ end
     dataNetwork:
         name: #@ values.akoOperator.config.avi_management_cluster_vip_network_name
         cidr: #@ values.akoOperator.config.avi_management_cluster_vip_network_cidr
@@ -92,10 +80,6 @@ spec:
         name: #@ values.akoOperator.config.avi_ca_name
         namespace: #@ values.akoOperator.namespace
     extraConfigs:
-#@ if values.akoOperator.config.avi_cni_plugin:
-#@overlay/match missing_ok=True
-        cniPlugin: #@ values.akoOperator.config.avi_cni_plugin
-#@ end
         disableStaticRouteSync: #@ values.akoOperator.config.avi_disable_static_route_sync
         ingress:
             disableIngressClass: #@ values.akoOperator.config.avi_disable_ingress_class
@@ -124,16 +108,12 @@ spec:
 apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1
 kind: AKODeploymentConfig
 metadata:
-    name: install-ako-for-all-npl
+    name: install-ako-for-node-port-local
 spec:
     #@overlay/match missing_ok=True
     clusterSelector:
         matchLabels:
-            nodeportlocal: "true"
-#@ if values.akoOperator.config.avi_controller_version != "":
-    #@overlay/match missing_ok=True
-    controllerVersion: #@ values.akoOperator.config.avi_controller_version
-#@ end
+            networking.tkg.tanzu.vmware.com/nodeportlocal: ""
     cloudName: #@ values.akoOperator.config.avi_cloud_name
     serviceEngineGroup: #@ values.akoOperator.config.avi_service_engine_group
     controller: #@ values.akoOperator.config.avi_controller
@@ -150,10 +130,6 @@ spec:
         name: #@ values.akoOperator.config.avi_control_plane_network
         cidr: #@ values.akoOperator.config.avi_control_plane_network_cidr
     extraConfigs:
-#@ if values.akoOperator.config.avi_cni_plugin:
-#@overlay/match missing_ok=True
-        cniPlugin: #@ values.akoOperator.config.avi_cni_plugin
-#@ end
         disableStaticRouteSync: #@ values.akoOperator.config.avi_disable_static_route_sync
         ingress:
             disableIngressClass: #@ values.akoOperator.config.avi_disable_ingress_class
diff --git a/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml b/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml
index a2f490371c..63de3fdc92 100644
--- a/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml
+++ b/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml
@@ -20,6 +20,7 @@ spec:
         name: ""
         cidr: ""
     extraConfigs:
+        cniPlugin: antrea
         disableStaticRouteSync: false
         ingress:
             disableIngressClass: true
@@ -50,6 +51,7 @@ spec:
         name: ""
         cidr: ""
     extraConfigs:
+        cniPlugin: antrea
         disableStaticRouteSync: false
         ingress:
             disableIngressClass: true
@@ -59,7 +61,7 @@ spec:
 apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1
 kind: AKODeploymentConfig
 metadata:
-    name: install-ako-for-all-npl
+    name: install-ako-for-node-port-local
 spec:
     cloudName: ""
     serviceEngineGroup: ""
@@ -77,6 +79,7 @@ spec:
         name: ""
         cidr: ""
     extraConfigs:
+        cniPlugin: antrea
         disableStaticRouteSync: false
         ingress:
             disableIngressClass: true