Delete loadBalancerSize

Signed-off-by: Wenqi Qiu <[email protected]>
vmware-tanzu · Jul 24, 2024 · 4c24291 · 4c24291
1 parent f477523
commit 4c24291
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 41 deletions.
diff --git a/build/yaml/crd/nsx.vmware.com_vpcnetworkconfigurations.yaml b/build/yaml/crd/nsx.vmware.com_vpcnetworkconfigurations.yaml
@@ -60,13 +60,6 @@ spec:
                   Default size of Subnets.
                   Defaults to 26.
                 type: integer
-              loadBalancerSize:
-                enum:
-                - Small
-                - Medium
-                - Large
-                - XLarge
-                type: string
               nsxProject:
                 description: NSX Project the Namespace associated with.
                 type: string

diff --git a/pkg/apis/nsx.vmware.com/v1alpha1/vpcnetworkconfiguration_types.go b/pkg/apis/nsx.vmware.com/v1alpha1/vpcnetworkconfiguration_types.go
@@ -9,13 +9,9 @@ import (
 )
 
 const (
-	AccessModePublic       string = "Public"
-	AccessModePrivate      string = "Private"
-	AccessModeProject      string = "PrivateTGW"
-	LoadBalancerSizeSmall  string = "Small"
-	LoadBalancerSizeMedium string = "Medium"
-	LoadBalancerSizeLarge  string = "Large"
-	LoadBalancerSizeXLarge string = "XLarge"
+	AccessModePublic  string = "Public"
+	AccessModePrivate string = "Private"
+	AccessModeProject string = "PrivateTGW"
 )
 
 // VPCNetworkConfigurationSpec defines the desired state of VPCNetworkConfiguration.
@@ -24,6 +20,12 @@ const (
 // in a Namespace's VPCNetworkConfiguration, the Namespace will use the value
 // in the default VPCNetworkConfiguration.
 type VPCNetworkConfigurationSpec struct {
+	// NSX path of the VPC the Namespace associated with.
+	// If VPC is set, only defaultIPv4SubnetSize and defaultSubnetAccessMode
+	// take effect, other fields are ignored.
+	// +optional
+	VPC string `json:"vpc,omitempty"`
+
 	// NSX Project the Namespace associated with.
 	NSXProject string `json:"nsxProject,omitempty"`
 
@@ -39,15 +41,6 @@ type VPCNetworkConfigurationSpec struct {
 	// +optional
 	ShortID string `json:"shortID,omitempty"`
 
-	// NSX path of the VPC the Namespace associated with.
-	// If VPC is set, only defaultIPv4SubnetSize and defaultSubnetAccessMode
-	// take effect, other fields are ignored.
-	// +optional
-	VPC string `json:"vpc,omitempty"`
-
-	// +kubebuilder:validation:Enum=Small;Medium;Large;XLarge
-	LoadBalancerSize string `json:"loadBalancerSize,omitempty"`
-
 	// Default size of Subnets.
 	// Defaults to 26.
 	// +kubebuilder:default=26

diff --git a/pkg/apis/v1alpha1/vpcnetworkconfiguration_types.go b/pkg/apis/v1alpha1/vpcnetworkconfiguration_types.go
@@ -9,13 +9,9 @@ import (
 )
 
 const (
-	AccessModePublic       string = "Public"
-	AccessModePrivate      string = "Private"
-	AccessModeProject      string = "PrivateTGW"
-	LoadBalancerSizeSmall  string = "Small"
-	LoadBalancerSizeMedium string = "Medium"
-	LoadBalancerSizeLarge  string = "Large"
-	LoadBalancerSizeXLarge string = "XLarge"
+	AccessModePublic  string = "Public"
+	AccessModePrivate string = "Private"
+	AccessModeProject string = "PrivateTGW"
 )
 
 // VPCNetworkConfigurationSpec defines the desired state of VPCNetworkConfiguration.
@@ -24,6 +20,12 @@ const (
 // in a Namespace's VPCNetworkConfiguration, the Namespace will use the value
 // in the default VPCNetworkConfiguration.
 type VPCNetworkConfigurationSpec struct {
+	// NSX path of the VPC the Namespace associated with.
+	// If VPC is set, only defaultIPv4SubnetSize and defaultSubnetAccessMode
+	// take effect, other fields are ignored.
+	// +optional
+	VPC string `json:"vpc,omitempty"`
+
 	// NSX Project the Namespace associated with.
 	NSXProject string `json:"nsxProject,omitempty"`
 
@@ -39,15 +41,6 @@ type VPCNetworkConfigurationSpec struct {
 	// +optional
 	ShortID string `json:"shortID,omitempty"`
 
-	// NSX path of the VPC the Namespace associated with.
-	// If VPC is set, only defaultIPv4SubnetSize and defaultSubnetAccessMode
-	// take effect, other fields are ignored.
-	// +optional
-	VPC string `json:"vpc,omitempty"`
-
-	// +kubebuilder:validation:Enum=Small;Medium;Large;XLarge
-	LoadBalancerSize string `json:"loadBalancerSize,omitempty"`
-
 	// Default size of Subnets.
 	// Defaults to 26.
 	// +kubebuilder:default=26

diff --git a/pkg/controllers/networkinfo/vpcnetworkconfig_handler.go b/pkg/controllers/networkinfo/vpcnetworkconfig_handler.go
@@ -110,7 +110,6 @@ func buildNetworkConfigInfo(vpcConfigCR v1alpha1.VPCNetworkConfiguration) (*comm
 		Org:                    org,
 		Name:                   vpcConfigCR.Name,
 		VPCConnectivityProfile: vpcConfigCR.Spec.VPCConnectivityProfile,
-		LoadBalancerSize:       vpcConfigCR.Spec.LoadBalancerSize,
 		NSXProject:             project,
 		PrivateIPs:             vpcConfigCR.Spec.PrivateIPs,
 		DefaultSubnetSize:      vpcConfigCR.Spec.DefaultSubnetSize,

diff --git a/pkg/nsx/services/common/types.go b/pkg/nsx/services/common/types.go
@@ -203,7 +203,6 @@ type VPCNetworkConfigInfo struct {
 	Org                    string
 	Name                   string
 	VPCConnectivityProfile string
-	LoadBalancerSize       string
 	NSXProject             string
 	ExternalIPv4Blocks     []string
 	PrivateIPs             []string