Update NetworkConfiguration CR with new VPC API #595
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,6 @@ | |
| bin/ | ||
| .DS_Store | ||
| go.work | ||
| go.work.sum | ||
| vendor/ | ||
| .golangci-bin/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,13 @@ import ( | |
| ) | ||
|
|
||
| const ( | ||
| AccessModePublic string = "Public" | ||
| AccessModePrivate string = "Private" | ||
| AccessModeProject string = "Project" | ||
| LbServiceSizeSmall string = "SMALL" | ||
| LbServiceSizeMedium string = "MEDIUM" | ||
| LbServiceSizeLarge string = "LARGE" | ||
| LbServiceSizeXlarge string = "XLARGE" | ||
| ) | ||
|
|
||
| // VPCNetworkConfigurationSpec defines the desired state of VPCNetworkConfiguration. | ||
|
|
@@ -21,14 +26,24 @@ const ( | |
| type VPCNetworkConfigurationSpec struct { | ||
| // PolicyPath of Tier0 or Tier0 VRF gateway. | ||
| DefaultGatewayPath string `json:"defaultGatewayPath,omitempty"` | ||
|
|
||
| // VPCConnectivityProfile ID. This profile has configuration related to create VPC transit gateway attachment. | ||
| VPCConnectivityProfile string `json:"vpcConnectivityProfile,omitempty"` | ||
|
|
||
| // +kubebuilder:validation:Enum=SMALL;MEDIUM;LARGE;XLARGE | ||
| LbServiceSize string `json:"lbServiceSize,omitempty"` | ||
|
|
||
| // Edge cluster path on which the networking elements will be created. | ||
| EdgeClusterPath string `json:"edgeClusterPath,omitempty"` | ||
|
|
||
| // NSX-T Project the Namespace associated with. | ||
| NSXTProject string `json:"nsxtProject,omitempty"` | ||
|
There was a problem hiding this comment. NSXTProject -> "NsxProject" There was a problem hiding this comment. The VPCNetworkConfigurationSpec should be like There was a problem hiding this comment. @wenqiq probably you missed this one? There was a problem hiding this comment. @dantingl do we only support for VPC new model or both old and new model? |
||
|
|
||
| // NSX-T IPv4 Block paths used to allocate external Subnets. | ||
| // +kubebuilder:validation:MinItems=0 | ||
| // +kubebuilder:validation:MaxItems=5 | ||
| ExternalIPv4Blocks []string `json:"externalIPv4Blocks,omitempty"` | ||
|
|
||
| // Private IPv4 CIDRs used to allocate Private Subnets. | ||
| // +kubebuilder:validation:MinItems=0 | ||
| // +kubebuilder:validation:MaxItems=5 | ||
|
|
@@ -37,12 +52,12 @@ type VPCNetworkConfigurationSpec struct { | |
| // Defaults to 26. | ||
| // +kubebuilder:default=26 | ||
| DefaultIPv4SubnetSize int `json:"defaultIPv4SubnetSize,omitempty"` | ||
| // DefaultPodSubnetAccessMode defines the access mode of the default SubnetSet for PodVM. | ||
| // Must be Public or Private. | ||
| // +kubebuilder:validation:Enum=Public;Private;Project | ||
| DefaultPodSubnetAccessMode string `json:"defaultPodSubnetAccessMode,omitempty"` | ||
|
There was a problem hiding this comment. change to PodSubnetAccessMode |
||
| // ShortID specifies Identifier to use when displaying VPC context in logs. | ||
| // Less than equal to 8 characters. | ||
| // +kubebuilder:validation:MaxLength=8 | ||
| // +optional | ||
| ShortID string `json:"shortID,omitempty"` | ||
|
|
@@ -64,9 +79,9 @@ type VPCInfo struct { | |
|
|
||
| // +genclient | ||
| // +genclient:nonNamespaced | ||
| // +kubebuilder:object:root=true | ||
| // +kubebuilder:subresource:status | ||
| // +kubebuilder:storageversion | ||
|
|
||
| // VPCNetworkConfiguration is the Schema for the vpcnetworkconfigurations API. | ||
| // +kubebuilder:resource:scope="Cluster" | ||
|
|
@@ -81,7 +96,7 @@ type VPCNetworkConfiguration struct { | |
| Status VPCNetworkConfigurationStatus `json:"status,omitempty"` | ||
| } | ||
|
|
||
| // +kubebuilder:object:root=true | ||
|
|
||
| // VPCNetworkConfigurationList contains a list of VPCNetworkConfiguration. | ||
| type VPCNetworkConfigurationList struct { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should not submit .gitignore