changes according to PR review

Author: vladcristi

api/v1beta1/types.go

@@ -854,8 +854,8 @@ type Subnet struct {
 	ID *string `json:"id,omitempty"`
 	// Subnet Name.
 	Name string `json:"name"`
-	// Skip specifies whether to skip creating subnets. If set to true(default: false) the ID
-	// has to be specified by the user to a valid Subnet ID.
+	// Skip specifies whether to skip creating subnets. If set to true (default: false) the ID
+	// must be specified by the user to a valid Subnet ID.
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 	// Subnet CIDR.
@@ -911,8 +911,8 @@ type VCN struct {
 	Name string `json:"name"`
 
 	// Skip specifies whether to skip creating VCN.
-	// When is set to true, InternetGateway, NatGateway, ServiceGateway, RouteTable should be also have Skip set to true
-	// If set to true(default: false) the ID has to be specified by the user to a valid VCN ID.
+	// When is set to true, InternetGateway, NatGateway, ServiceGateway, RouteTable must have also Skip set to true
+	// If set to true(default: false) the ID must be specified by the user to a valid VCN ID.
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 

api/v1beta2/types.go

@@ -855,7 +855,7 @@ type Subnet struct {
 	// Subnet Name.
 	Name string `json:"name"`
 	// Skip specifies whether to skip creating subnets. If set to true(default: false) the ID
-	// has to be specified by the user to a valid Subnet ID.
+	// must be specified by the user to a valid Subnet ID.
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 	// Subnet CIDR.
@@ -911,8 +911,8 @@ type VCN struct {
 	Name string `json:"name"`
 
 	// Skip specifies whether to skip creating VCN.
-	// When is set to true, InternetGateway, NatGateway, ServiceGateway, RouteTable should be also have Skip set to true
-	// If set to true(default: false) the ID has to be specified by the user to a valid VCN ID.
+	// When is set to true, InternetGateway, NatGateway, ServiceGateway, RouteTable must have also Skip set to true
+	// If set to true(default: false) the ID must be specified by the user to a valid VCN ID.
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 
@@ -1135,7 +1135,7 @@ type RemotePeeringConnection struct {
 // InternetGateway is used to specify the options for creating internet gateway.
 type InternetGateway struct {
 	// Skip specifies whether to skip creating internet gateway even if any one Subnet is public.
-	// In case of VCN being Skipped (Skip field of VCN set to true), this field should be true also
+	// In case of VCN being Skipped (Skip field of VCN set to true), this field must be true also
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 
@@ -1147,7 +1147,7 @@ type InternetGateway struct {
 // NATGateway is used to specify the options for creating NAT gateway.
 type NATGateway struct {
 	// Skip specifies whether to skip creating NAT gateway even if any one Subnet is private.
-	// In case of VCN being Skipped (Skip field of VCN set to true), this field should be true also
+	// In case of VCN being Skipped (Skip field of VCN set to true), this field must be true also
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 
@@ -1159,7 +1159,7 @@ type NATGateway struct {
 // ServiceGateway is used to specify the options for creating Service gateway.
 type ServiceGateway struct {
 	// Skip specifies whether to skip creating Service gateway.
-	// In case of VCN being Skipped (Skip field of VCN set to true), this field should be true also
+	// In case of VCN being Skipped (Skip field of VCN set to true), this field must be true also
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 
@@ -1171,7 +1171,7 @@ type ServiceGateway struct {
 // RouteTable is used to specify the options for creating Route table.
 type RouteTable struct {
 	// Skip specifies whether to skip creating Route table.
-	// In case of VCN being Skipped (Skip field of VCN set to true), this field should be true also
+	// In case of VCN being Skipped (Skip field of VCN set to true), this field must be true also
 	// +optional
 	Skip bool `json:"skip,omitempty"`
 

test/e2e/cluster_test.go

@@ -582,7 +582,7 @@ var _ = Describe("Workload cluster creation", func() {
 		}, result)
 	})
 
-	It("Self manage NSG [PRBlocking]", func() {
+	It("Self manage NSG", func() {
 		clusterName = getClusterName(clusterNamePrefix, "self-manage-nsg")
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 			ClusterProxy: bootstrapClusterProxy,