Skip to content

NetworkCompartmentId implementation + fixes for OCIManagedMachinePool #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

NetworkCompartmentId implementation + fixes for OCIManagedMachinePool #455

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fcb4aeb
network compartment, bug fixes
alcampag Sep 26, 2025
1e62e02
Merge branch 'oracle:main' into main
alcampag Sep 26, 2025
c58e517
Merge branch 'oracle:main' into main
alcampag Oct 2, 2025
31f6ecb
Finished implementing NetworkCompartmentId feature + some more fixes
alcampag Oct 2, 2025
070fd4b
Merge branch 'main' of https://github.com/oracle/cluster-api-provider…
alcampag Oct 15, 2025
c3ec65e
feat(tests): add e2e support for OCI managed network compartment
alcampag Oct 15, 2025
7dcb15c
Fixed and merged with main branch
alcampag Oct 16, 2025
bc92874
Merge branch 'oracle:main' into main
alcampag Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,10 @@ type NetworkSpec struct {
// VCNPeering configuration.
// +optional
VCNPeering *VCNPeering `json:"vcnPeering,omitempty"`

// CompartmentId where to provision network resources
// +optional
CompartmentId string `json:"compartmentId,omitempty"`
}

// VCNPeering defines the VCN peering details of the workload cluster VCN.
Expand Down
2 changes: 2 additions & 0 deletions api/v1beta1/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions api/v1beta2/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,10 @@ type NetworkSpec struct {
// VCNPeering configuration.
// +optional
VCNPeering *VCNPeering `json:"vcnPeering,omitempty"`

// CompartmentId where to provision network resources
// +optional
CompartmentId string `json:"compartmentId,omitempty"`
}

// VCNPeering defines the VCN peering details of the workload cluster VCN.
Expand Down
8 changes: 8 additions & 0 deletions cloud/scope/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,14 @@ func (s *ClusterScope) GetCompartmentId() string {
return s.OCIClusterAccessor.GetCompartmentId()
}

// GetCompartmentId returns the CompartmentId defined in OCICluster's spec
func (s *ClusterScope) GetNetworkCompartmentId() string {
if s.OCIClusterAccessor.GetNetworkCompartmentId() == "" {
return s.GetCompartmentId()
}
return s.OCIClusterAccessor.GetNetworkCompartmentId()
}

// APIServerPort returns the APIServerPort to use when creating the load balancer.
func (s *ClusterScope) APIServerPort() int32 {
if s.Cluster.Spec.ClusterNetwork != nil && s.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
Expand Down
2 changes: 2 additions & 0 deletions cloud/scope/cluster_accessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ type OCIClusterAccessor interface {
GetDefinedTags() map[string]map[string]string
// GetCompartmentId returns the compartment id of the cluster.
GetCompartmentId() string
// GetNetworkCompartmentId returns the compartment id where network resources are created
GetNetworkCompartmentId() string
// GetFreeformTags returns the free form tags of the cluster.
GetFreeformTags() map[string]string
// GetName returns the name of the cluster.
Expand Down
4 changes: 2 additions & 2 deletions cloud/scope/drg_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (s *ClusterScope) GetDRG(ctx context.Context) (*core.Drg, error) {

for {
response, err := s.VCNClient.ListDrgs(ctx, core.ListDrgsRequest{
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
Page: page,
})
if err != nil {
Expand Down Expand Up @@ -113,7 +113,7 @@ func (s *ClusterScope) GetDRG(ctx context.Context) (*core.Drg, error) {
func (s *ClusterScope) createDRG(ctx context.Context) (*core.Drg, error) {
response, err := s.VCNClient.CreateDrg(ctx, core.CreateDrgRequest{
CreateDrgDetails: core.CreateDrgDetails{
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
FreeformTags: s.GetFreeFormTags(),
DefinedTags: s.GetDefinedTags(),
DisplayName: common.String(s.GetDRGName()),
Expand Down
4 changes: 2 additions & 2 deletions cloud/scope/drg_rpc_attachment_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func (s *ClusterScope) createRPC(ctx context.Context, drgId *string, displayName
DrgId: drgId,
FreeformTags: s.GetFreeFormTags(),
DefinedTags: s.GetDefinedTags(),
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
},
})
if err != nil {
Expand Down Expand Up @@ -176,7 +176,7 @@ func (s *ClusterScope) lookupRPC(ctx context.Context, drgId *string, rpcId *stri
var page *string
response, err := vcnClient.ListRemotePeeringConnections(ctx, core.ListRemotePeeringConnectionsRequest{
DrgId: drgId,
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
Page: page,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cloud/scope/drg_vcn_attachment_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (s *ClusterScope) GetDRGAttachment(ctx context.Context) (*core.DrgAttachmen
DisplayName: common.String(s.OCIClusterAccessor.GetName()),
DrgId: s.getDrgID(),
NetworkId: s.OCIClusterAccessor.GetNetworkSpec().Vcn.ID,
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
})

if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cloud/scope/internet_gateway_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (s *ClusterScope) GetInternetGateway(ctx context.Context) (*core.InternetGa
}
}
igws, err := s.VCNClient.ListInternetGateways(ctx, core.ListInternetGatewaysRequest{
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
VcnId: s.getVcnId(),
DisplayName: common.String(InternetGatewayName),
})
Expand All @@ -95,7 +95,7 @@ func (s *ClusterScope) GetInternetGateway(ctx context.Context) (*core.InternetGa
// CreateInternetGateway creates the Internet Gateway for the cluster based on the ClusterScope
func (s *ClusterScope) CreateInternetGateway(ctx context.Context) (*string, error) {
igwDetails := core.CreateInternetGatewayDetails{
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
DisplayName: common.String(InternetGatewayName),
IsEnabled: common.Bool(true),
VcnId: s.getVcnId(),
Expand Down
4 changes: 2 additions & 2 deletions cloud/scope/load_balancer_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func (s *ClusterScope) CreateLB(ctx context.Context, lb infrastructurev1beta2.Lo
}

lbDetails := loadbalancer.CreateLoadBalancerDetails{
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
DisplayName: common.String(lb.Name),
ShapeName: common.String("flexible"),
ShapeDetails: &loadbalancer.ShapeDetails{MinimumBandwidthInMbps: common.Int(10),
Expand Down Expand Up @@ -279,7 +279,7 @@ func (s *ClusterScope) GetLoadBalancers(ctx context.Context) (*loadbalancer.Load
var page *string
for {
lbs, err := s.LoadBalancerClient.ListLoadBalancers(ctx, loadbalancer.ListLoadBalancersRequest{
CompartmentId: common.String(s.GetCompartmentId()),
CompartmentId: common.String(s.GetNetworkCompartmentId()),
DisplayName: common.String(s.GetControlPlaneLoadBalancerName()),
Page: page,
})
Expand Down
154 changes: 133 additions & 21 deletions cloud/scope/managed_machine_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ func (m *ManagedMachinePoolScope) FindNodePool(ctx context.Context) (*oke.NodePo
if err != nil {
return nil, err
}
// This effectively breaks the use case of bring your own node pool, as it will need to also have the freeform tag
if m.IsResourceCreatedByClusterAPI(response.FreeformTags) {
return &response.NodePool, nil
} else {
Expand Down Expand Up @@ -281,20 +282,24 @@ func (m *ManagedMachinePoolScope) CreateNodePool(ctx context.Context) (*oke.Node
BootVolumeSizeInGBs: machinePool.Spec.NodeSourceViaImage.BootVolumeSizeInGBs,
}
podNetworkOptions := machinePool.Spec.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails
if podNetworkOptions != nil {
if podNetworkOptions.CniType == infrastructurev1beta2.VCNNativeCNI {
npnDetails := oke.OciVcnIpNativeNodePoolPodNetworkOptionDetails{
PodSubnetIds: m.getPodSubnets(podNetworkOptions.VcnIpNativePodNetworkOptions.SubnetNames),
PodNsgIds: m.getPodNSGs(podNetworkOptions.VcnIpNativePodNetworkOptions.NSGNames),
}
if podNetworkOptions.VcnIpNativePodNetworkOptions.MaxPodsPerNode != nil {
npnDetails.MaxPodsPerNode = podNetworkOptions.VcnIpNativePodNetworkOptions.MaxPodsPerNode
if podNetworkOptions != nil {
m.setDefaultCNIType(podNetworkOptions)
switch podNetworkOptions.CniType {
case infrastructurev1beta2.VCNNativeCNI:
npnDetails := oke.OciVcnIpNativeNodePoolPodNetworkOptionDetails{
PodSubnetIds: m.getPodSubnets(podNetworkOptions.VcnIpNativePodNetworkOptions.SubnetNames),
PodNsgIds: m.getPodNSGs(podNetworkOptions.VcnIpNativePodNetworkOptions.NSGNames),
}
if podNetworkOptions.VcnIpNativePodNetworkOptions.MaxPodsPerNode != nil {
npnDetails.MaxPodsPerNode = podNetworkOptions.VcnIpNativePodNetworkOptions.MaxPodsPerNode
}
nodeConfigDetails.NodePoolPodNetworkOptionDetails = npnDetails
case infrastructurev1beta2.FlannelCNI:
nodeConfigDetails.NodePoolPodNetworkOptionDetails = oke.FlannelOverlayNodePoolPodNetworkOptionDetails{}
default:
return nil, errors.New("unexpected CniType")
}
nodeConfigDetails.NodePoolPodNetworkOptionDetails = npnDetails
} else if podNetworkOptions.CniType == infrastructurev1beta2.FlannelCNI {
nodeConfigDetails.NodePoolPodNetworkOptionDetails = oke.FlannelOverlayNodePoolPodNetworkOptionDetails{}
}
}
nodePoolDetails := oke.CreateNodePoolDetails{
CompartmentId: common.String(m.OCIManagedCluster.Spec.CompartmentId),
ClusterId: m.OCIManagedControlPlane.Spec.ID,
Expand All @@ -305,7 +310,7 @@ func (m *ManagedMachinePoolScope) CreateNodePool(ctx context.Context) (*oke.Node
NodeSourceDetails: &sourceDetails,
FreeformTags: m.getFreeFormTags(),
DefinedTags: m.getDefinedTags(),
SshPublicKey: common.String(m.OCIManagedMachinePool.Spec.SshPublicKey),
SshPublicKey: m.OCIManagedMachinePool.Spec.SshPublicKey,
NodeConfigDetails: &nodeConfigDetails,
NodeMetadata: m.OCIManagedMachinePool.Spec.NodeMetadata,
}
Expand Down Expand Up @@ -360,7 +365,11 @@ func (m *ManagedMachinePoolScope) CreateNodePool(ctx context.Context) (*oke.Node
}

func (m *ManagedMachinePoolScope) setNodepoolImageId(ctx context.Context) error {
imageId := m.OCIManagedMachinePool.Spec.NodeSourceViaImage.ImageId
var imageId *string
if m.OCIManagedMachinePool.Spec.NodeSourceViaImage != nil {
imageId = m.OCIManagedMachinePool.Spec.NodeSourceViaImage.ImageId
}
Copy link
Member

@joekr joekr Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great catch here


if imageId != nil && *imageId != "" {
return nil
}
Expand Down Expand Up @@ -405,7 +414,11 @@ func (m *ManagedMachinePoolScope) setNodepoolImageId(ctx context.Context) error
}
if strings.Contains(sourceName, k8sVersion) {
m.Info("Image being used", "Name", sourceName, "OCID", *image.ImageId)
m.OCIManagedMachinePool.Spec.NodeSourceViaImage.ImageId = image.ImageId
if m.OCIManagedMachinePool.Spec.NodeSourceViaImage != nil {
m.OCIManagedMachinePool.Spec.NodeSourceViaImage.ImageId = image.ImageId
} else {
m.OCIManagedMachinePool.Spec.NodeSourceViaImage = &infrav2exp.NodeSourceViaImage{ImageId: image.ImageId}
}
Copy link
Member

@joekr joekr Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: what about something a bit more like? (code untested).

nodeSourceViaImage := m.OCIManagedMachinePool.Spec.NodeSourceViaImage
// Create NodeSourceViaImage if it doesn't exist
if nodeSourceViaImage == nil {
    nodeSourceViaImage = &infrav2exp.NodeSourceViaImage{}
    m.OCIManagedMachinePool.Spec.NodeSourceViaImage = nodeSourceViaImage
}
nodeSourceViaImage.ImageId = image.ImageId

My thinking is the logic is more clear to me, but I get it isn't to all. If it is nil, we create it otherwise just set it. 🤷 not a deal breaker at all.

return nil
}
}
Expand Down Expand Up @@ -533,6 +546,12 @@ func (m *ManagedMachinePoolScope) getPodSubnets(subnets []string) []string {
}
}
}
} else {
for _, subnet := range m.OCIManagedCluster.Spec.NetworkSpec.Vcn.Subnets {
if subnet != nil && subnet.Role == infrastructurev1beta2.PodRole {
subnetList = append(subnetList, *subnet.ID)
Copy link
Member

@joekr joekr Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure what we want to do here. Originally we were pulling the spec pod subnets, which I believe get updated. So wouldn't the subnets be up to date here when reconciled?

If I'm reading this correctly if the subnet id in the spec is nil this will make API calls to get the subnet info. I understand that, but I guess I'm trying to understand why the subnet ID would be nil even after the reconcile. I'm probably not understanding something.

}
}
}
return subnetList
}
Expand All @@ -547,6 +566,12 @@ func (m *ManagedMachinePoolScope) getPodNSGs(nsgs []string) []string {
}
}
}
} else {
for _, nsg := range m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List {
if nsg != nil && nsg.Role == infrastructurev1beta2.PodRole {
nsgList = append(nsgList, *nsg.ID)
}
}
}
return nsgList
}
Expand Down Expand Up @@ -600,6 +625,7 @@ func (m *ManagedMachinePoolScope) UpdateNodePool(ctx context.Context, pool *oke.
nodePoolSizeUpdateRequired = true
}
actual := m.getSpecFromAPIObject(pool)
setSpecFromActual(spec, actual)
if !reflect.DeepEqual(spec, actual) ||
m.getNodePoolName() != *pool.Name || nodePoolSizeUpdateRequired {
m.Logger.Info("Updating node pool")
Expand Down Expand Up @@ -667,7 +693,9 @@ func (m *ManagedMachinePoolScope) UpdateNodePool(ctx context.Context, pool *oke.

podNetworkOptions := spec.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails
if podNetworkOptions != nil {
if podNetworkOptions.CniType == infrastructurev1beta2.VCNNativeCNI {
m.setDefaultCNIType(podNetworkOptions)
switch podNetworkOptions.CniType {
case infrastructurev1beta2.VCNNativeCNI:
npnDetails := oke.OciVcnIpNativeNodePoolPodNetworkOptionDetails{
PodSubnetIds: m.getPodSubnets(podNetworkOptions.VcnIpNativePodNetworkOptions.SubnetNames),
PodNsgIds: m.getPodNSGs(podNetworkOptions.VcnIpNativePodNetworkOptions.NSGNames),
Expand All @@ -676,8 +704,10 @@ func (m *ManagedMachinePoolScope) UpdateNodePool(ctx context.Context, pool *oke.
npnDetails.MaxPodsPerNode = podNetworkOptions.VcnIpNativePodNetworkOptions.MaxPodsPerNode
}
nodeConfigDetails.NodePoolPodNetworkOptionDetails = npnDetails
} else if podNetworkOptions.CniType == infrastructurev1beta2.FlannelCNI {
case infrastructurev1beta2.FlannelCNI:
nodeConfigDetails.NodePoolPodNetworkOptionDetails = oke.FlannelOverlayNodePoolPodNetworkOptionDetails{}
default:
return false, errors.New("unexpected CniType")
}
}
nodePoolDetails := oke.UpdateNodePoolDetails{
Expand All @@ -686,7 +716,7 @@ func (m *ManagedMachinePoolScope) UpdateNodePool(ctx context.Context, pool *oke.
NodeShape: common.String(m.OCIManagedMachinePool.Spec.NodeShape),
NodeShapeConfig: &nodeShapeConfig,
NodeSourceDetails: &sourceDetails,
SshPublicKey: common.String(m.OCIManagedMachinePool.Spec.SshPublicKey),
SshPublicKey: m.OCIManagedMachinePool.Spec.SshPublicKey,
NodeConfigDetails: &nodeConfigDetails,
NodeMetadata: spec.NodeMetadata,
}
Expand Down Expand Up @@ -727,6 +757,81 @@ func (m *ManagedMachinePoolScope) UpdateNodePool(ctx context.Context, pool *oke.
return false, nil
}

func (m *ManagedMachinePoolScope) setDefaultCNIType(podNetworkOptions *infrav2exp.NodePoolPodNetworkOptionDetails) {
if podNetworkOptions.CniType == "" && len(m.OCIManagedControlPlane.Spec.ClusterPodNetworkOptions) > 0 {
podNetworkOptions.CniType = m.OCIManagedControlPlane.Spec.ClusterPodNetworkOptions[0].CniType
}
}

// The main reconciliation loop for the node pool is triggered by reflect.DeepEqual(spec, actual). While it's correct to update a node pool if the spec has changed,
// this can lead to an infinite update loop for some parameters that are not specified in spec, but they are returned by the actual state of the node pool.
// To solve this, spec is updated before the reflect.DeepEqual(spec, actual) only for those problematic parameters
func setSpecFromActual(spec *infrav2exp.OCIManagedMachinePoolSpec, actual *expinfra1.OCIManagedMachinePoolSpec) {
Copy link
Member

@joekr joekr Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to become a nightmare to keep up to date if there are any changes to machinepool. There has to be a better way to do this. This seems very brittle.

Copy link
Member

@joekr joekr Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is mutating the spec at the very least. I wonder if we should at least make a copy instead of mutating the spec 🤔

Copy link
Member

@joekr joekr Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about something like instead compute a minimal “desired patch” (only fields the user specified) and trigger UpdateNodePool only if that patch has at least one field set.

I would have put this comment up in the UpdateNodePool method, but since the context is all here I thought I would put it here.

if spec.NodeEvictionNodePoolSettings != nil && actual.NodeEvictionNodePoolSettings != nil {
if spec.NodeEvictionNodePoolSettings.EvictionGraceDuration == nil {
spec.NodeEvictionNodePoolSettings.EvictionGraceDuration = actual.NodeEvictionNodePoolSettings.EvictionGraceDuration
}
if spec.NodeEvictionNodePoolSettings.IsForceDeleteAfterGraceDuration == nil {
spec.NodeEvictionNodePoolSettings.IsForceDeleteAfterGraceDuration = actual.NodeEvictionNodePoolSettings.IsForceDeleteAfterGraceDuration
}
} else {
spec.NodeEvictionNodePoolSettings = actual.NodeEvictionNodePoolSettings
}
if spec.NodePoolCyclingDetails != nil && actual.NodePoolCyclingDetails != nil {
if spec.NodePoolCyclingDetails.IsNodeCyclingEnabled == nil {
spec.NodePoolCyclingDetails.IsNodeCyclingEnabled = actual.NodePoolCyclingDetails.IsNodeCyclingEnabled
}
if spec.NodePoolCyclingDetails.MaximumSurge == nil {
spec.NodePoolCyclingDetails.MaximumSurge = actual.NodePoolCyclingDetails.MaximumSurge
}
if spec.NodePoolCyclingDetails.MaximumUnavailable == nil {
spec.NodePoolCyclingDetails.MaximumUnavailable = actual.NodePoolCyclingDetails.MaximumUnavailable
}
} else {
spec.NodePoolCyclingDetails = actual.NodePoolCyclingDetails
}
if spec.NodePoolNodeConfig != nil && actual.NodePoolNodeConfig != nil {
// Someone has removed NsgNames from the spec, the new defaults becomes the currently attached NSGs
if spec.NodePoolNodeConfig.NsgNames == nil {
spec.NodePoolNodeConfig.NsgNames = actual.NodePoolNodeConfig.NsgNames
}
if spec.NodePoolNodeConfig.IsPvEncryptionInTransitEnabled == nil {
spec.NodePoolNodeConfig.IsPvEncryptionInTransitEnabled = actual.NodePoolNodeConfig.IsPvEncryptionInTransitEnabled
}
if spec.NodePoolNodeConfig.KmsKeyId == nil {
spec.NodePoolNodeConfig.KmsKeyId = actual.NodePoolNodeConfig.KmsKeyId
}
if spec.NodePoolNodeConfig.PlacementConfigs == nil {
spec.NodePoolNodeConfig.PlacementConfigs = actual.NodePoolNodeConfig.PlacementConfigs
}

if nodePoolPodNetwork := spec.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails; nodePoolPodNetwork != nil {
if actualNodePoolNetwork := actual.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails; actualNodePoolNetwork != nil {
if nodePoolPodNetwork.VcnIpNativePodNetworkOptions.SubnetNames == nil {
nodePoolPodNetwork.VcnIpNativePodNetworkOptions.SubnetNames = actualNodePoolNetwork.VcnIpNativePodNetworkOptions.SubnetNames
}
if nodePoolPodNetwork.VcnIpNativePodNetworkOptions.NSGNames == nil {
nodePoolPodNetwork.VcnIpNativePodNetworkOptions.NSGNames = actualNodePoolNetwork.VcnIpNativePodNetworkOptions.NSGNames
}
}
}

} else {
spec.NodePoolNodeConfig = actual.NodePoolNodeConfig
}
if spec.NodeSourceViaImage != nil && actual.NodeSourceViaImage != nil {
if spec.NodeSourceViaImage.BootVolumeSizeInGBs == nil {
spec.NodeSourceViaImage.BootVolumeSizeInGBs = actual.NodeSourceViaImage.BootVolumeSizeInGBs
}
} else {
spec.NodeSourceViaImage = actual.NodeSourceViaImage
}

if spec.SshPublicKey == nil {
spec.SshPublicKey = actual.SshPublicKey
}
}

// setMachinePoolSpecDefaults sets the defaults in the spec as returned by OKE API. We need to set defaults here rather than webhook as
// there is a chance user will edit the cluster
func setMachinePoolSpecDefaults(spec *infrav2exp.OCIManagedMachinePoolSpec) {
Expand All @@ -744,8 +849,15 @@ func setMachinePoolSpecDefaults(spec *infrav2exp.OCIManagedMachinePoolSpec) {
podNetworkOptions := spec.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails
if podNetworkOptions != nil {
if podNetworkOptions.CniType == infrastructurev1beta2.VCNNativeCNI {
// 31 is the default max pods per node returned by OKE API
spec.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails.VcnIpNativePodNetworkOptions.MaxPodsPerNode = common.Int(31)
if podNetworkOptions.VcnIpNativePodNetworkOptions.MaxPodsPerNode == nil {
// 31 is the default max pods per node returned by OKE API
spec.NodePoolNodeConfig.NodePoolPodNetworkOptionDetails.VcnIpNativePodNetworkOptions.MaxPodsPerNode = common.Int(31)
}
} else {
// Default value for VcnIpNativePodNetworkOptions should be an empty struct if vcn native CNI is not specified
if !reflect.DeepEqual(podNetworkOptions.VcnIpNativePodNetworkOptions, infrav2exp.VcnIpNativePodNetworkOptions{}) {
podNetworkOptions.VcnIpNativePodNetworkOptions = infrav2exp.VcnIpNativePodNetworkOptions{}
}
}
}
}
Expand Down Expand Up @@ -800,7 +912,7 @@ func (m *ManagedMachinePoolScope) getSpecFromAPIObject(pool *oke.NodePool) *expi
}
}
if pool.SshPublicKey != nil {
spec.SshPublicKey = *pool.SshPublicKey
spec.SshPublicKey = pool.SshPublicKey
}
if pool.NodeShapeConfig != nil {
nodeShapeConfig := expinfra1.NodeShapeConfig{}
Expand Down
Loading