Feat: VCN Native CNI Changes (#407)

* bug: Update the CRDs for the workrequest feature (#387)

This was left out of the previous feature add.

* changes to uptake go-v1.22.9

* manifests generated with new controller gen

* Feat: API Spec & CRD & Conversion for VCN Native Params

* Feat: NPN CR Reconciliation in OCIMachine_controller

* Fix: Add common label for compatibility & remove non-related crd changes from open source

* Revert "Fix: Add common label for compatibility & remove non-related crd changes from open source"

This reverts commit f816852.

* Fix: Improve NPN CR Reconcile

* Fix: Kube Client Creation

* Fix: Update CNI Type String

* Fix: Return nil upon retry

* Fix: unused var

* Fix: improve logging and error display

* Fix: Use different CR for get and create

* Feat: include the NPN Reconcile into client scope package

* Style: Remove Redudant Const

* Feat: Move CniType to OCICluster

* Image build

* Image build

* Image build

* Logging update

---------

Co-authored-by: Joe Kratzat <joekr@users.noreply.github.com>
Co-authored-by: Peizhao Li <peizhao.li@oracle.com>

Author: 3 people

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.8 as builder
+FROM golang:1.22.9 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -369,7 +369,7 @@ envsubst: $(ENVSUBST) ## Build a local copy of envsubst.
 kubectl: $(KUBECTL) ## Build a local copy of kubectl.
 
 $(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
-	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.13.0
+	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.14.0
 
 $(CONVERSION_GEN): ## Download controller-gen locally if necessary.
 	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) v0.23.1

api/v1beta1/ocicluster_conversion.go

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

api/v1beta1/ocimachine_types.go

@@ -145,6 +145,17 @@ type OCIMachineSpec struct {
 	// Specifies whether to delete or preserve the data volumes created during launch when
 	//terminating an instance. When set to true, the data volumes are preserved. The default value is true.
 	PreserveDataVolumesCreatedAtLaunch bool `json:"preserveDataVolumesCreatedAtLaunch,omitempty"`
+
+	// Specifies the list of pod subnets being used for the VCN IP NATIVE CNI type for pod networking.
+	// Set on each NPN CR associated with the OCI Machine.
+	PodSubnetIds []string `json:"podSubnetIds,omitempty"`
+
+	// Specifies the maximum number of pods allowed for each node, decided by the shape
+	MaxPodPerNode int `json:"maxPodCount,omitempty"`
+
+	// Specifies the list of Network Security Groups used for the VCN IP NATIVE CNI type for pod networking.
+	// Set on each NPN CR associated with the OCI Machine.
+	PodNSGIds []string `json:"podNsgIds,omitempty"`
 }
 
 // OCIMachineStatus defines the observed state of OCIMachine.

api/v1beta1/types.go

@@ -1009,6 +1009,9 @@ type NetworkSpec struct {
 	// VCNPeering configuration.
 	// +optional
 	VCNPeering *VCNPeering `json:"vcnPeering,omitempty"`
+
+	// The CNI to be used are OCI_VCN_IP_NATIVE and FLANNEL_OVERLAY
+	CniType CNIOptionEnum `json:"cniType,omitempty"`
 }
 
 // VCNPeering defines the VCN peering details of the workload cluster VCN.

api/v1beta1/zz_generated.conversion.go

@@ -139,6 +139,17 @@ type OCIMachineSpec struct {
 	// Specifies whether to delete or preserve the data volumes created during launch when
 	//terminating an instance. When set to true, the data volumes are preserved. The default value is true.
 	PreserveDataVolumesCreatedAtLaunch bool `json:"preserveDataVolumesCreatedAtLaunch,omitempty"`
+
+	// Specifies the list of pod subnets being used for the VCN IP NATIVE CNI type for pod networking.
+	// Set on each NPN CR associated with the OCI Machine.
+	PodSubnetIds []string `json:"podSubnetIds,omitempty"`
+
+	// Specifies the maximum number of pods allowed for each node, decided by the shape
+	MaxPodPerNode int `json:"maxPodCount,omitempty"`
+
+	// Specifies the list of Network Security Groups used for the VCN IP NATIVE CNI type for pod networking.
+	// Set on each NPN CR associated with the OCI Machine.
+	PodNSGIds []string `json:"podNsgIds,omitempty"`
 }
 
 // OCIMachineStatus defines the observed state of OCIMachine.

api/v1beta1/zz_generated.deepcopy.go

@@ -1018,6 +1018,9 @@ type NetworkSpec struct {
 	// VCNPeering configuration.
 	// +optional
 	VCNPeering *VCNPeering `json:"vcnPeering,omitempty"`
+
+	// The CNI to be used are OCI_VCN_IP_NATIVE and FLANNEL_OVERLAY
+	CniType CNIOptionEnum `json:"cniType,omitempty"`
 }
 
 // VCNPeering defines the VCN peering details of the workload cluster VCN.