From ae37f9a10730e31f58cffa7c5ff25529c24d02a4 Mon Sep 17 00:00:00 2001 From: Chen Lin Date: Wed, 29 Mar 2023 21:29:59 +0800 Subject: [PATCH 1/3] Add install-ako-for-all-npl akoDeploymentConfig --- .../overlays/overlay-akodeploymentconfig.yaml | 54 +++++++++++++++++++ .../akooperator/akodeploymentconfig.yaml | 29 ++++++++++ tkg/managementcomponents/helper.go | 1 + tkg/managementcomponents/helper_test.go | 2 + ...re_with_avi_enabled_bootstrap_cluster.yaml | 2 + ...e_with_avi_enabled_management_cluster.yaml | 2 + tkg/managementcomponents/types.go | 1 + 7 files changed, 91 insertions(+) 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 ca5b31cf29..e9cf9855d7 100644 --- a/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml +++ b/packages/ako-operator-v2/bundle/config/overlays/overlay-akodeploymentconfig.yaml @@ -117,3 +117,57 @@ spec: networksConfig: nsxtT1LR: #@ values.akoOperator.config.avi_nsxt_t1_lr #@ end + +#@overlay/match by=overlay.subset({"kind": "AKODeploymentConfig", "metadata": {"name": "install-ako-for-all-npl"}}) +--- +#@overlay/replace +apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1 +kind: AKODeploymentConfig +metadata: + name: install-ako-for-all-npl +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 + cloudName: #@ values.akoOperator.config.avi_cloud_name + serviceEngineGroup: #@ values.akoOperator.config.avi_service_engine_group + controller: #@ values.akoOperator.config.avi_controller + adminCredentialRef: + name: #@ values.akoOperator.config.avi_admin_credential_name + namespace: #@ values.akoOperator.namespace + certificateAuthorityRef: + name: #@ values.akoOperator.config.avi_ca_name + namespace: #@ values.akoOperator.namespace + dataNetwork: + name: #@ values.akoOperator.config.avi_data_network + cidr: #@ values.akoOperator.config.avi_data_network_cidr + controlPlaneNetwork: + 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 + defaultIngressController: #@ values.akoOperator.config.avi_ingress_default_ingress_controller +#@ if values.akoOperator.config.avi_ingress_shard_vs_size != "": + #@overlay/match missing_ok=True + shardVSSize: #@ values.akoOperator.config.avi_ingress_shard_vs_size +#@ end +#@ if values.akoOperator.config.avi_ingress_node_network_list != '""': + #@overlay/match missing_ok=True + nodeNetworkList: #@ json.decode(values.akoOperator.config.avi_ingress_node_network_list) +#@ end +#@ if values.akoOperator.config.avi_nsxt_t1_lr: + #@overlay/match missing_ok=True + networksConfig: + nsxtT1LR: #@ values.akoOperator.config.avi_nsxt_t1_lr +#@ end 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 d42d6d7e70..b732eb5ad9 100644 --- a/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml +++ b/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml @@ -1,3 +1,4 @@ +#@ load("@ytt:data", "data") --- apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1 kind: AKODeploymentConfig @@ -54,3 +55,31 @@ spec: ingress: disableIngressClass: true defaultIngressController: false + +--- +apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1 +kind: AKODeploymentConfig +metadata: + name: install-ako-for-all-npl +spec: + cloudName: "" + serviceEngineGroup: "" + controller: "" + adminCredentialRef: + name: controller-credentials + namespace: default + certificateAuthorityRef: + name: controller-ca + namespace: default + dataNetwork: + name: "" + cidr: "" + controlPlaneNetwork: + name: "" + cidr: "" + extraConfigs: + disableStaticRouteSync: false + ingress: + disableIngressClass: true + serviceType: NodePortLocal + defaultIngressController: false diff --git a/tkg/managementcomponents/helper.go b/tkg/managementcomponents/helper.go index 0cf72f8155..12a46916b6 100644 --- a/tkg/managementcomponents/helper.go +++ b/tkg/managementcomponents/helper.go @@ -240,6 +240,7 @@ func setAkoOperatorConfig(tkgPackageConfig *TKGPackageConfig, userProviderConfig AviLabels: aviLabelsJsonString, AviControlPlaneHaProvider: convertToBool(userProviderConfigValues[constants.ConfigVariableVsphereHaProvider]), AviIngressNodeNetworkList: nodeNetworkList, + AviCniPlugin: convertToString(userProviderConfigValues[constants.ConfigVariableCNI]), }, }, } diff --git a/tkg/managementcomponents/helper_test.go b/tkg/managementcomponents/helper_test.go index 35e5105dd3..6fe10a1209 100644 --- a/tkg/managementcomponents/helper_test.go +++ b/tkg/managementcomponents/helper_test.go @@ -397,6 +397,7 @@ tkr-package: "AVI_SERVICE_ENGINE_GROUP": "Default-Group", "AVI_USERNAME": "admin", "PROVIDER_TYPE": "vsphere", + "CNI": "antrea", } }) It("should not return error", func() { @@ -581,6 +582,7 @@ tkr-package: "AVI_SERVICE_ENGINE_GROUP": "Default-Group", "AVI_USERNAME": "admin", "PROVIDER_TYPE": "vsphere", + "CNI": "antrea", } }) It("should not return error", func() { diff --git a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml index d011965d27..ae2160be02 100644 --- a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml +++ b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml @@ -14,6 +14,7 @@ configvalues: AVI_PASSWORD: Admin!23 AVI_SERVICE_ENGINE_GROUP: Default-Group AVI_USERNAME: admin + CNI: antrea PROVIDER_TYPE: vsphere frameworkPackage: versionConstraints: v0.21.0 @@ -67,3 +68,4 @@ akoOperatorPackage: avi_management_cluster_control_plane_vip_network_cidr: 10.191.176.0/20 avi_control_plane_ha_provider: true avi_ingress_node_network_list: '[{"networkName":"node-network-name","cidrs":["10.191.176.0/20"]}]' + avi_cni_plugin: antrea diff --git a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml index ad18a0e4e9..ee0503fce1 100644 --- a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml +++ b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml @@ -14,6 +14,7 @@ configvalues: AVI_PASSWORD: Admin!23 AVI_SERVICE_ENGINE_GROUP: Default-Group AVI_USERNAME: admin + CNI: antrea PROVIDER_TYPE: vsphere frameworkPackage: versionConstraints: v0.21.0 @@ -66,3 +67,4 @@ akoOperatorPackage: avi_management_cluster_control_plane_vip_network_cidr: 10.191.176.0/20 avi_control_plane_ha_provider: true avi_ingress_node_network_list: '[{"networkName":"node-network-name","cidrs":["10.191.176.0/20"]}]' + avi_cni_plugin: antrea diff --git a/tkg/managementcomponents/types.go b/tkg/managementcomponents/types.go index 2616c1e9a8..a49190c72d 100644 --- a/tkg/managementcomponents/types.go +++ b/tkg/managementcomponents/types.go @@ -157,4 +157,5 @@ type AkoOperatorConfig struct { AviNSXTT1Router string `yaml:"avi_nsxt_t1_lr,omitempty"` AviControlPlaneHaProvider bool `yaml:"avi_control_plane_ha_provider,omitempty"` AviIngressNodeNetworkList string `yaml:"avi_ingress_node_network_list,omitempty"` + AviCniPlugin string `yaml:"avi_cni_plugin,omitempty"` } From 00ac65de7fab8ae2f62750efe6acd329c7852d53 Mon Sep 17 00:00:00 2001 From: Chen Lin Date: Thu, 6 Apr 2023 08:33:08 +0000 Subject: [PATCH 2/3] Revert changes about getting cni --- .../bundle/config/upstream/akooperator/akodeploymentconfig.yaml | 1 - tkg/managementcomponents/helper.go | 1 - tkg/managementcomponents/helper_test.go | 2 -- .../test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml | 2 -- .../output_vsphere_with_avi_enabled_management_cluster.yaml | 2 -- tkg/managementcomponents/types.go | 1 - 6 files changed, 9 deletions(-) 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 b732eb5ad9..a2f490371c 100644 --- a/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml +++ b/packages/ako-operator-v2/bundle/config/upstream/akooperator/akodeploymentconfig.yaml @@ -1,4 +1,3 @@ -#@ load("@ytt:data", "data") --- apiVersion: networking.tkg.tanzu.vmware.com/v1alpha1 kind: AKODeploymentConfig diff --git a/tkg/managementcomponents/helper.go b/tkg/managementcomponents/helper.go index 12a46916b6..0cf72f8155 100644 --- a/tkg/managementcomponents/helper.go +++ b/tkg/managementcomponents/helper.go @@ -240,7 +240,6 @@ func setAkoOperatorConfig(tkgPackageConfig *TKGPackageConfig, userProviderConfig AviLabels: aviLabelsJsonString, AviControlPlaneHaProvider: convertToBool(userProviderConfigValues[constants.ConfigVariableVsphereHaProvider]), AviIngressNodeNetworkList: nodeNetworkList, - AviCniPlugin: convertToString(userProviderConfigValues[constants.ConfigVariableCNI]), }, }, } diff --git a/tkg/managementcomponents/helper_test.go b/tkg/managementcomponents/helper_test.go index 6fe10a1209..35e5105dd3 100644 --- a/tkg/managementcomponents/helper_test.go +++ b/tkg/managementcomponents/helper_test.go @@ -397,7 +397,6 @@ tkr-package: "AVI_SERVICE_ENGINE_GROUP": "Default-Group", "AVI_USERNAME": "admin", "PROVIDER_TYPE": "vsphere", - "CNI": "antrea", } }) It("should not return error", func() { @@ -582,7 +581,6 @@ tkr-package: "AVI_SERVICE_ENGINE_GROUP": "Default-Group", "AVI_USERNAME": "admin", "PROVIDER_TYPE": "vsphere", - "CNI": "antrea", } }) It("should not return error", func() { diff --git a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml index ae2160be02..d011965d27 100644 --- a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml +++ b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_bootstrap_cluster.yaml @@ -14,7 +14,6 @@ configvalues: AVI_PASSWORD: Admin!23 AVI_SERVICE_ENGINE_GROUP: Default-Group AVI_USERNAME: admin - CNI: antrea PROVIDER_TYPE: vsphere frameworkPackage: versionConstraints: v0.21.0 @@ -68,4 +67,3 @@ akoOperatorPackage: avi_management_cluster_control_plane_vip_network_cidr: 10.191.176.0/20 avi_control_plane_ha_provider: true avi_ingress_node_network_list: '[{"networkName":"node-network-name","cidrs":["10.191.176.0/20"]}]' - avi_cni_plugin: antrea diff --git a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml index ee0503fce1..ad18a0e4e9 100644 --- a/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml +++ b/tkg/managementcomponents/test/output_vsphere_with_avi_enabled_management_cluster.yaml @@ -14,7 +14,6 @@ configvalues: AVI_PASSWORD: Admin!23 AVI_SERVICE_ENGINE_GROUP: Default-Group AVI_USERNAME: admin - CNI: antrea PROVIDER_TYPE: vsphere frameworkPackage: versionConstraints: v0.21.0 @@ -67,4 +66,3 @@ akoOperatorPackage: avi_management_cluster_control_plane_vip_network_cidr: 10.191.176.0/20 avi_control_plane_ha_provider: true avi_ingress_node_network_list: '[{"networkName":"node-network-name","cidrs":["10.191.176.0/20"]}]' - avi_cni_plugin: antrea diff --git a/tkg/managementcomponents/types.go b/tkg/managementcomponents/types.go index a49190c72d..2616c1e9a8 100644 --- a/tkg/managementcomponents/types.go +++ b/tkg/managementcomponents/types.go @@ -157,5 +157,4 @@ type AkoOperatorConfig struct { AviNSXTT1Router string `yaml:"avi_nsxt_t1_lr,omitempty"` AviControlPlaneHaProvider bool `yaml:"avi_control_plane_ha_provider,omitempty"` AviIngressNodeNetworkList string `yaml:"avi_ingress_node_network_list,omitempty"` - AviCniPlugin string `yaml:"avi_cni_plugin,omitempty"` } From dbb19e92888cbe722665bd647fe9b144d12e3154 Mon Sep 17 00:00:00 2001 From: Chen Lin Date: Fri, 7 Apr 2023 08:15:49 +0000 Subject: [PATCH 3/3] 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