conversion beta1-beta2 changes

Author: vladcristi

api/v1beta1/ocicluster_conversion.go

@@ -50,11 +50,6 @@ func (src *OCICluster) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.NetworkSpec.APIServerLB.LoadBalancerType
 	dst.Spec.ClientOverrides = restored.Spec.ClientOverrides
 
-	dst.Spec.NetworkSpec.Vcn.Skip = restored.Spec.NetworkSpec.Vcn.Skip
-	for i := range dst.Spec.NetworkSpec.Vcn.Subnets {
-		dst.Spec.NetworkSpec.Vcn.Subnets[i] = restored.Spec.NetworkSpec.Vcn.Subnets[i]
-	}
-
 	return nil
 }
 

api/v1beta1/ociclustertemplate_conversion.go

@@ -44,11 +44,6 @@ func (src *OCIClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.Template.Spec.NetworkSpec.APIServerLB.LoadBalancerType
 	dst.Spec.Template.Spec.ClientOverrides = restored.Spec.Template.Spec.ClientOverrides
 
-	dst.Spec.Template.Spec.NetworkSpec.Vcn.Skip = restored.Spec.Template.Spec.NetworkSpec.Vcn.Skip
-	for i := range dst.Spec.Template.Spec.NetworkSpec.Vcn.Subnets {
-		dst.Spec.Template.Spec.NetworkSpec.Vcn.Subnets[i] = restored.Spec.Template.Spec.NetworkSpec.Vcn.Subnets[i]
-	}
-
 	return nil
 }
 

api/v1beta1/ocimanagedcluster_conversion.go

@@ -50,11 +50,6 @@ func (src *OCIManagedCluster) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.NetworkSpec.APIServerLB.LoadBalancerType
 	dst.Spec.ClientOverrides = restored.Spec.ClientOverrides
 
-	dst.Spec.NetworkSpec.Vcn.Skip = restored.Spec.NetworkSpec.Vcn.Skip
-	for i := range dst.Spec.NetworkSpec.Vcn.Subnets {
-		dst.Spec.NetworkSpec.Vcn.Subnets[i] = restored.Spec.NetworkSpec.Vcn.Subnets[i]
-	}
-
 	return nil
 }
 

api/v1beta1/types.go

@@ -854,6 +854,9 @@ type Subnet struct {
 	ID *string `json:"id,omitempty"`
 	// Subnet Name.
 	Name string `json:"name"`
+	// Skip specifies whether to skip creating subnets.
+	// +optional
+	Skip bool `json:"skip,omitempty"`
 	// Subnet CIDR.
 	// +optional
 	CIDR string `json:"cidr,omitempty"`
@@ -906,6 +909,10 @@ type VCN struct {
 	// +optional
 	Name string `json:"name"`
 
+	// Skip specifies whether to skip creating VCN.
+	// +optional
+	Skip bool `json:"skip,omitempty"`
+
 	// VCN CIDR.
 	// +optional
 	// Deprecated, please use NetworkDetails.cidrs