changes according to suggestions

Author: vladcristi

api/v1beta1/ociclustertemplate_conversion.go

@@ -43,7 +43,6 @@ func (src *OCIClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Template.Spec.AvailabilityDomains = restored.Spec.Template.Spec.AvailabilityDomains
 	dst.Spec.Template.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.Template.Spec.NetworkSpec.APIServerLB.LoadBalancerType
 	dst.Spec.Template.Spec.ClientOverrides = restored.Spec.Template.Spec.ClientOverrides
-
 	return nil
 }
 

api/v1beta1/ocimanagedcluster_conversion.go

@@ -49,7 +49,6 @@ func (src *OCIManagedCluster) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.NetworkSpec.Vcn.RouteTable.Skip = restored.Spec.NetworkSpec.Vcn.RouteTable.Skip
 	dst.Spec.NetworkSpec.APIServerLB.LoadBalancerType = restored.Spec.NetworkSpec.APIServerLB.LoadBalancerType
 	dst.Spec.ClientOverrides = restored.Spec.ClientOverrides
-
 	return nil
 }
 

api/v1beta1/types.go

@@ -856,6 +856,7 @@ type Subnet struct {
 	Name string `json:"name"`
 	// Skip specifies whether to skip creating subnets.
 	// +optional
+
 	Skip bool `json:"skip,omitempty"`
 	// Subnet CIDR.
 	// +optional

cloud/scope/nsg_reconciler.go

@@ -31,7 +31,7 @@ import (
 
 func (s *ClusterScope) ReconcileNSG(ctx context.Context) error {
 	if s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup.Skip {
-		s.Logger.Info("Skipping Network Secuirty Group reconciliation as per spec")
+		s.Logger.Info("Skipping Network Security Group reconciliation as per spec")
 		return nil
 	}
 	desiredNSGs := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup
@@ -129,7 +129,7 @@ func (s *ClusterScope) GetNSG(ctx context.Context, spec infrastructurev1beta2.NS
 
 func (s *ClusterScope) DeleteNSGs(ctx context.Context) error {
 	if s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup.Skip {
-		s.Logger.Info("Skipping Network Secuirty Group reconciliation as per spec")
+		s.Logger.Info("Skipping Network Security Group reconciliation as per spec")
 		return nil
 	}
 	desiredNSGs := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup

cloud/scope/subnet_reconciler.go

@@ -33,6 +33,7 @@ func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {
 	desiredSubnets := s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets
 	for _, desiredSubnet := range desiredSubnets {
 		if desiredSubnet.Skip {
+			s.Logger.Info("Skipping Subnet reconciliation as per spec")
 			continue
 		}
 		subnet, err := s.GetSubnet(ctx, *desiredSubnet)
@@ -192,6 +193,7 @@ func (s *ClusterScope) DeleteSubnets(ctx context.Context) error {
 	desiredSubnets := s.GetSubnetsSpec()
 	for _, desiredSubnet := range desiredSubnets {
 		if desiredSubnet.Skip {
+			s.Logger.Info("Skipping Subnet reconciliation as per spec")
 			continue
 		}
 		subnet, err := s.GetSubnet(ctx, *desiredSubnet)

docs/src/gs/externally-managed-cluster-infrastructure.md

@@ -49,7 +49,7 @@ spec:
 In the above spec, note that name has to be mentioned for Subnet/NSG. This is so that Kubernetes
 can merge the list properly when there is an update.
 
-## Example spec for externally managed VCN, Subnet and Gateways, but the other networking components self managed
+## Example spec for externally managed VCN, Subnet, Internet Gateway, Nat Gateway, Service Gateway and routing table, but the other networking components are still managed by CAPOCI (e.g. Network Security Groups)
 
 Example spec is given below
 
@@ -63,7 +63,7 @@ spec:
   networkSpec:
     vcn:
       skip: true
-      id: <Insert VCN OCID Here>
+      id: <Insert VCN OCID Here>  // REQUIRED
       networkSecurityGroup:
         skip: false
       internetGateway:
@@ -75,22 +75,22 @@ spec:
       routeTable:
         skip: true
       subnets:
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here>  // REQUIRED
           role: control-plane-endpoint
           name: control-plane-endpoint
           type: public
           skip: true
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here>  // REQUIRED
           role: worker
           name: worker
           type: private
           skip: true
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here>  // REQUIRED
           role: control-plane
           name: control-plane
           type: private
           skip: true
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here>  // REQUIRED
           role: service-lb
           name: service-lb
           type: public
@@ -141,8 +141,6 @@ spec:
           role: worker
 ```
 
-
-
 ## Status
 
 As per the Cluster API Provider specification, the `OCICluster Status` Object has to be updated with `ready` status

docs/src/managed/networking.md

@@ -48,10 +48,9 @@ kind: OCIManagedCluster
 spec:
   compartmentId: "${OCI_COMPARTMENT_ID}"
   networkSpec:
-    skipNetworkManagement: true
     vcn:
       skip: true
-      id: <Insert VCN OCID Here>
+      id: <Insert VCN OCID Here> // REQUIRED
       networkSecurityGroup:
         skip: false
       internetGateway:
@@ -63,22 +62,22 @@ spec:
       routeTable:
         skip: true
       subnets:
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here> // REQUIRED
           role: control-plane-endpoint
           name: control-plane-endpoint
           type: public
           skip: true
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here> // REQUIRED
           role: worker
           name: worker
           type: private
           skip: true
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here> // REQUIRED
           role: control-plane
           name: control-plane
           type: private
           skip: true
-        - id: <Insert control Plane Subnet OCID Here>
+        - id: <Insert control Plane Subnet OCID Here> // REQUIRED
           role: service-lb
           name: service-lb
           type: public

templates/cluster-template-with-nsg.yaml

@@ -36,7 +36,7 @@ spec:
   compartmentId: "${OCI_COMPARTMENT_ID}"
   networkSpec:
     vcn:
-      id: 
+      id: "${VCN_ID}"
       skip: true
       networkSecurityGroup:
         skip: false
@@ -49,22 +49,22 @@ spec:
       routeTable:
         skip: true
       subnets:
-        - id: 
+        - id: "${SUBNET_ID_CPE}"
           role: control-plane-endpoint
           name: control-plane-endpoint
           type: public
           skip: true
-        - id: 
+        - id: "${SUBNET_ID_W}"
           role: worker
           name: worker
           type: private
           skip: true
-        - id: 
+        - id: "${SUBNET_ID_CP}"
           role: control-plane
           name: control-plane
           type: private
           skip: true
-        - id: 
+        - id: "${SUBNET_ID_LB}"
           role: service-lb
           name: service-lb
           type: public