changes_for_fix (#459)

vladcristi · web-flow · commit 186828682bc2 · 2025-10-16T19:05:52.000+03:00
diff --git a/cloud/scope/load_balancer_reconciler.go b/cloud/scope/load_balancer_reconciler.go
@@ -163,7 +163,7 @@ func (s *ClusterScope) CreateLB(ctx context.Context, lb infrastructurev1beta2.Lo
 	var controlPlaneEndpointSubnets []string
 	for _, subnet := range ptr.ToSubnetSlice(s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets) {
 		if subnet.ID != nil && subnet.Role == infrastructurev1beta2.ControlPlaneEndpointRole {
-			controlPlaneEndpointSubnets = append(controlPlaneEndpointSubnets, *subnet.ID)
+			controlPlaneEndpointSubnets = append(controlPlaneEndpointSubnets, ptr.ToString(subnet.ID))
 		}
 	}
 	if len(controlPlaneEndpointSubnets) < 1 {
diff --git a/cloud/scope/machine_pool.go b/cloud/scope/machine_pool.go
@@ -861,17 +861,17 @@ func (m *MachinePoolScope) getWorkerMachineNSGs() []string {
 		nsgs := make([]string, 0)
 		for _, nsgName := range instanceVnicConfiguration.NsgNames {
 			for _, nsg := range ptr.ToNSGSlice(m.OCIClusterAccesor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List) {
-				if nsg.ID != nil && nsg.Name == nsgName {
-					nsgs = append(nsgs, *nsg.ID)
+				if nsg.Name == nsgName {
+					nsgs = append(nsgs, ptr.ToString(nsg.ID))
 				}
 			}
 		}
 		return nsgs
 	} else {
 		nsgs := make([]string, 0)
 		for _, nsg := range ptr.ToNSGSlice(m.OCIClusterAccesor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List) {
-			if nsg.ID != nil && nsg.Role == infrastructurev1beta2.WorkerRole {
-				nsgs = append(nsgs, *nsg.ID)
+			if nsg.Role == infrastructurev1beta2.WorkerRole {
+				nsgs = append(nsgs, ptr.ToString(nsg.ID))
 			}
 		}
 		return nsgs
diff --git a/cloud/scope/managed_control_plane.go b/cloud/scope/managed_control_plane.go
@@ -389,7 +389,7 @@ func (s *ManagedControlPlaneScope) getServiceLbSubnets() []string {
 	subnets := make([]string, 0)
 	for _, subnet := range ptr.ToSubnetSlice(s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets) {
 		if subnet.Role == infrastructurev1beta2.ServiceLoadBalancerRole {
-			subnets = append(subnets, *subnet.ID)
+			subnets = append(subnets, ptr.ToString(subnet.ID))
 		}
 	}
 	return subnets
diff --git a/cloud/scope/managed_machine_pool.go b/cloud/scope/managed_machine_pool.go
@@ -528,8 +528,8 @@ func (m *ManagedMachinePoolScope) getPodSubnets(subnets []string) []string {
 	if len(subnets) > 0 {
 		for _, subnetName := range subnets {
 			for _, subnet := range ptr.ToSubnetSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.Subnets) {
-				if subnet.ID != nil && subnet.Name == subnetName {
-					subnetList = append(subnetList, *subnet.ID)
+				if subnet.Name == subnetName {
+					subnetList = append(subnetList, ptr.ToString(subnet.ID))
 				}
 			}
 		}
diff --git a/cloud/scope/nsg_reconciler.go b/cloud/scope/nsg_reconciler.go
@@ -36,17 +36,17 @@ func (s *ClusterScope) ReconcileNSG(ctx context.Context) error {
 		return nil
 	}
 	desiredNSGs := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup
-	for _, desiredNSG := range ptr.ToNSGSlice(desiredNSGs.List) {
-		nsg, err := s.GetNSG(ctx, desiredNSG)
+	for _, desiredNSG := range desiredNSGs.List {
+		nsg, err := s.GetNSG(ctx, *desiredNSG)
 		if err != nil {
 			s.Logger.Error(err, "error to get nsg")
 			return err
 		}
 		if nsg != nil {
 			nsgOCID := nsg.Id
 			desiredNSG.ID = nsgOCID
-			if !s.IsNSGEqual(nsg, desiredNSG) {
-				err = s.UpdateNSG(ctx, desiredNSG)
+			if !s.IsNSGEqual(nsg, *desiredNSG) {
+				err = s.UpdateNSG(ctx, *desiredNSG)
 				if err != nil {
 					return err
 				}
@@ -55,7 +55,7 @@ func (s *ClusterScope) ReconcileNSG(ctx context.Context) error {
 			continue
 		}
 		s.Logger.Info("Creating the network security list")
-		nsgID, err := s.CreateNSG(ctx, desiredNSG)
+		nsgID, err := s.CreateNSG(ctx, *desiredNSG)
 		if err != nil {
 			return err
 		}
@@ -135,8 +135,8 @@ func (s *ClusterScope) DeleteNSGs(ctx context.Context) error {
 		return nil
 	}
 	desiredNSGs := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup
-	for _, desiredNSG := range ptr.ToNSGSlice(desiredNSGs.List) {
-		nsg, err := s.GetNSG(ctx, desiredNSG)
+	for _, desiredNSG := range desiredNSGs.List {
+		nsg, err := s.GetNSG(ctx, *desiredNSG)
 		if err != nil && !ociutil.IsNotFound(err) {
 			return err
 		}
@@ -484,9 +484,10 @@ func getProtocolOptionsForSpec(icmp *core.IcmpOptions, tcp *core.TcpOptions, udp
 }
 
 func getNsgIdFromName(nsgName *string, list []*infrastructurev1beta2.NSG) *string {
-	for _, nsg := range ptr.ToNSGSlice(list) {
-		if nsg.Name == *nsgName {
-			return nsg.ID
+	nsgSlice := ptr.ToNSGSlice(list)
+	for i := range nsgSlice {
+		if nsgSlice[i].Name == *nsgName {
+			return nsgSlice[i].ID
 		}
 	}
 	return nil
@@ -496,7 +497,10 @@ func getNsgNameFromId(nsgId *string, list []*infrastructurev1beta2.NSG) *string
 	if nsgId == nil {
 		return nil
 	}
-	for _, nsg := range ptr.ToNSGSlice(list) {
+
+	nsgSlice := ptr.ToNSGSlice(list)
+	for i := range nsgSlice {
+		nsg := &nsgSlice[i]
 		if nsg.ID != nil && reflect.DeepEqual(nsg.ID, nsgId) {
 			return &nsg.Name
 		}
diff --git a/cloud/scope/subnet_reconciler.go b/cloud/scope/subnet_reconciler.go
@@ -32,13 +32,13 @@ import (
 )
 
 func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {
-	desiredSubnets := ptr.ToSubnetSlice(s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets)
+	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)
+		subnet, err := s.GetSubnet(ctx, *desiredSubnet)
 		if err != nil {
 			return err
 		}
@@ -69,10 +69,10 @@ func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {
 					}
 				}
 			}
-			if s.IsSubnetsEqual(subnet, desiredSubnet) {
+			if s.IsSubnetsEqual(subnet, *desiredSubnet) {
 				s.Logger.Info("No Reconciliation Required for Subnet", "subnet", subnetOCID)
 			} else {
-				err = s.UpdateSubnet(ctx, desiredSubnet)
+				err = s.UpdateSubnet(ctx, *desiredSubnet)
 				if err != nil {
 					return err
 				}
@@ -90,7 +90,7 @@ func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {
 			s.Logger.Info("Created the security list", "ocid", seclistId)
 			desiredSubnet.SecurityList.ID = seclistId
 		}
-		subnetId, err := s.CreateSubnet(ctx, desiredSubnet)
+		subnetId, err := s.CreateSubnet(ctx, *desiredSubnet)
 		if err != nil {
 			return err
 		}
@@ -197,13 +197,13 @@ func (s *ClusterScope) UpdateSubnet(ctx context.Context, spec infrastructurev1be
 }
 
 func (s *ClusterScope) DeleteSubnets(ctx context.Context) error {
-	desiredSubnets := ptr.ToSubnetSlice(s.GetSubnetsSpec())
+	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)
+		subnet, err := s.GetSubnet(ctx, *desiredSubnet)
 		if err != nil && !ociutil.IsNotFound(err) {
 			return err
 		}
@@ -325,7 +325,9 @@ func (s *ClusterScope) isControlPlaneEndpointSubnetPrivate() bool {
 }
 
 func (s *ClusterScope) GetControlPlaneEndpointSubnetCidr() string {
-	for _, subnet := range ptr.ToSubnetSlice(s.GetSubnetsSpec()) {
+	subnetSlice := ptr.ToSubnetSlice(s.GetSubnetsSpec())
+	for i := range subnetSlice {
+		subnet := &subnetSlice[i]
 		if subnet.Role == infrastructurev1beta2.ControlPlaneEndpointRole {
 			if subnet.CIDR != "" {
 				return subnet.CIDR
@@ -336,7 +338,9 @@ func (s *ClusterScope) GetControlPlaneEndpointSubnetCidr() string {
 }
 
 func (s *ClusterScope) GetServiceLoadBalancerSubnetCidr() string {
-	for _, subnet := range ptr.ToSubnetSlice(s.GetSubnetsSpec()) {
+	subnetSlice := ptr.ToSubnetSlice(s.GetSubnetsSpec())
+	for i := range subnetSlice {
+		subnet := &subnetSlice[i]
 		if subnet.Role == infrastructurev1beta2.ServiceLoadBalancerRole {
 			if subnet.CIDR != "" {
 				return subnet.CIDR
@@ -347,9 +351,10 @@ func (s *ClusterScope) GetServiceLoadBalancerSubnetCidr() string {
 }
 
 func (s *ClusterScope) NodeSubnetCidr() []string {
-	subnets := s.GetNodeSubnet()
 	var nodeCIDR []string
-	for _, subnet := range ptr.ToSubnetSlice(subnets) {
+	subnetSlice := ptr.ToSubnetSlice(s.GetNodeSubnet())
+	for i := range subnetSlice {
+		subnet := &subnetSlice[i]
 		if subnet.CIDR != "" {
 			nodeCIDR = append(nodeCIDR, subnet.CIDR)
 		}
@@ -372,7 +377,9 @@ func (s *ClusterScope) GetControlPlaneMachineSubnetCidr() string {
 
 // IsAllSubnetsPrivate determines if all the ClusterScope's subnets are private
 func (s *ClusterScope) IsAllSubnetsPrivate() bool {
-	for _, subnet := range ptr.ToSubnetSlice(s.GetSubnetsSpec()) {
+	subnetSlice := ptr.ToSubnetSlice(s.GetSubnetsSpec())
+	for i := range subnetSlice {
+		subnet := &subnetSlice[i]
 		if subnet.Type == infrastructurev1beta2.Public {
 			return false
 		}
diff --git a/cloud/scope/util.go b/cloud/scope/util.go
@@ -33,7 +33,7 @@ func GetNsgNamesFromId(ids []string, nsgs []*infrastructurev1beta2.NSG) []string
 	names := make([]string, 0)
 	for _, id := range ids {
 		for _, nsg := range ptr.ToNSGSlice(nsgs) {
-			if nsg.ID != nil && id == *nsg.ID {
+			if id == ptr.ToString(nsg.ID) {
 				names = append(names, nsg.Name)
 			}
 		}
@@ -44,7 +44,7 @@ func GetNsgNamesFromId(ids []string, nsgs []*infrastructurev1beta2.NSG) []string
 // GetSubnetNameFromId returns the name of the Subnet with the provided ID
 func GetSubnetNameFromId(id *string, subnets []*infrastructurev1beta2.Subnet) string {
 	for _, subnet := range ptr.ToSubnetSlice(subnets) {
-		if subnet.ID != nil && *id == *subnet.ID {
+		if ptr.ToString(id) == ptr.ToString(subnet.ID) {
 			return subnet.Name
 		}
 	}
@@ -56,7 +56,7 @@ func GetSubnetNamesFromId(ids []string, subnets []*infrastructurev1beta2.Subnet)
 	names := make([]string, 0)
 	for _, id := range ids {
 		for _, subnet := range ptr.ToSubnetSlice(subnets) {
-			if subnet.ID != nil && id == *subnet.ID {
+			if id == ptr.ToString(subnet.ID) {
 				names = append(names, subnet.Name)
 			}
 		}
diff --git a/cloud/scope/virtual_machine_pool.go b/cloud/scope/virtual_machine_pool.go
@@ -393,15 +393,15 @@ func (m *VirtualMachinePoolScope) getWorkerMachineNSGs() []string {
 	if len(specNsgNames) > 0 {
 		for _, nsgName := range specNsgNames {
 			for _, nsg := range ptr.ToNSGSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List) {
-				if nsg.ID != nil && nsg.Name == nsgName {
-					nsgList = append(nsgList, *nsg.ID)
+				if nsg.Name == nsgName {
+					nsgList = append(nsgList, ptr.ToString(nsg.ID))
 				}
 			}
 		}
 	} else {
 		for _, nsg := range ptr.ToNSGSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List) {
-			if nsg.ID != nil && nsg.Role == infrastructurev1beta2.WorkerRole {
-				nsgList = append(nsgList, *nsg.ID)
+			if nsg.Role == infrastructurev1beta2.WorkerRole {
+				nsgList = append(nsgList, ptr.ToString(nsg.ID))
 			}
 		}
 	}
@@ -423,8 +423,8 @@ func (m *VirtualMachinePoolScope) getPodNSGs(nsgs []string) []string {
 	if len(nsgs) > 0 {
 		for _, nsgName := range nsgs {
 			for _, nsg := range ptr.ToNSGSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List) {
-				if nsg.ID != nil && nsg.Name == nsgName {
-					nsgList = append(nsgList, *nsg.ID)
+				if nsg.Name == nsgName {
+					nsgList = append(nsgList, ptr.ToString(nsg.ID))
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func (s *ClusterScope) CreateLB(ctx context.Context, lb infrastructurev1beta2.Lo`
`163`	`163`	`var controlPlaneEndpointSubnets []string`
`164`	`164`	`for _, subnet := range ptr.ToSubnetSlice(s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets) {`
`165`	`165`	`if subnet.ID != nil && subnet.Role == infrastructurev1beta2.ControlPlaneEndpointRole {`
`166`		`- controlPlaneEndpointSubnets = append(controlPlaneEndpointSubnets, *subnet.ID)`
	`166`	`+ controlPlaneEndpointSubnets = append(controlPlaneEndpointSubnets, ptr.ToString(subnet.ID))`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`if len(controlPlaneEndpointSubnets) < 1 {`
Original file line number	Diff line number	Diff line change
`@@ -861,17 +861,17 @@ func (m *MachinePoolScope) getWorkerMachineNSGs() []string {`
`861`	`861`	`nsgs := make([]string, 0)`
`862`	`862`	`for _, nsgName := range instanceVnicConfiguration.NsgNames {`
`863`	`863`	`for _, nsg := range ptr.ToNSGSlice(m.OCIClusterAccesor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List) {`
`864`		`- if nsg.ID != nil && nsg.Name == nsgName {`
`865`		`- nsgs = append(nsgs, *nsg.ID)`
	`864`	`+ if nsg.Name == nsgName {`
	`865`	`+ nsgs = append(nsgs, ptr.ToString(nsg.ID))`
`866`	`866`	`}`
`867`	`867`	`}`
`868`	`868`	`}`
`869`	`869`	`return nsgs`
`870`	`870`	`} else {`
`871`	`871`	`nsgs := make([]string, 0)`
`872`	`872`	`for _, nsg := range ptr.ToNSGSlice(m.OCIClusterAccesor.GetNetworkSpec().Vcn.NetworkSecurityGroup.List) {`
`873`		`- if nsg.ID != nil && nsg.Role == infrastructurev1beta2.WorkerRole {`
`874`		`- nsgs = append(nsgs, *nsg.ID)`
	`873`	`+ if nsg.Role == infrastructurev1beta2.WorkerRole {`
	`874`	`+ nsgs = append(nsgs, ptr.ToString(nsg.ID))`
`875`	`875`	`}`
`876`	`876`	`}`
`877`	`877`	`return nsgs`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ func (s *ManagedControlPlaneScope) getServiceLbSubnets() []string {`
`389`	`389`	`subnets := make([]string, 0)`
`390`	`390`	`for _, subnet := range ptr.ToSubnetSlice(s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets) {`
`391`	`391`	`if subnet.Role == infrastructurev1beta2.ServiceLoadBalancerRole {`
`392`		`- subnets = append(subnets, *subnet.ID)`
	`392`	`+ subnets = append(subnets, ptr.ToString(subnet.ID))`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`	`return subnets`
Original file line number	Diff line number	Diff line change
`@@ -528,8 +528,8 @@ func (m *ManagedMachinePoolScope) getPodSubnets(subnets []string) []string {`
`528`	`528`	`if len(subnets) > 0 {`
`529`	`529`	`for _, subnetName := range subnets {`
`530`	`530`	`for _, subnet := range ptr.ToSubnetSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.Subnets) {`
`531`		`- if subnet.ID != nil && subnet.Name == subnetName {`
`532`		`- subnetList = append(subnetList, *subnet.ID)`
	`531`	`+ if subnet.Name == subnetName {`
	`532`	`+ subnetList = append(subnetList, ptr.ToString(subnet.ID))`
`533`	`533`	`}`
`534`	`534`	`}`
`535`	`535`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,17 +36,17 @@ func (s *ClusterScope) ReconcileNSG(ctx context.Context) error {`
`36`	`36`	`return nil`
`37`	`37`	`}`
`38`	`38`	`desiredNSGs := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup`
`39`		`- for _, desiredNSG := range ptr.ToNSGSlice(desiredNSGs.List) {`
`40`		`- nsg, err := s.GetNSG(ctx, desiredNSG)`
	`39`	`+ for _, desiredNSG := range desiredNSGs.List {`
	`40`	`+ nsg, err := s.GetNSG(ctx, *desiredNSG)`
`41`	`41`	`if err != nil {`
`42`	`42`	`s.Logger.Error(err, "error to get nsg")`
`43`	`43`	`return err`
`44`	`44`	`}`
`45`	`45`	`if nsg != nil {`
`46`	`46`	`nsgOCID := nsg.Id`
`47`	`47`	`desiredNSG.ID = nsgOCID`
`48`		`- if !s.IsNSGEqual(nsg, desiredNSG) {`
`49`		`- err = s.UpdateNSG(ctx, desiredNSG)`
	`48`	`+ if !s.IsNSGEqual(nsg, *desiredNSG) {`
	`49`	`+ err = s.UpdateNSG(ctx, *desiredNSG)`
`50`	`50`	`if err != nil {`
`51`	`51`	`return err`
`52`	`52`	`}`
`@@ -55,7 +55,7 @@ func (s *ClusterScope) ReconcileNSG(ctx context.Context) error {`
`55`	`55`	`continue`
`56`	`56`	`}`
`57`	`57`	`s.Logger.Info("Creating the network security list")`
`58`		`- nsgID, err := s.CreateNSG(ctx, desiredNSG)`
	`58`	`+ nsgID, err := s.CreateNSG(ctx, *desiredNSG)`
`59`	`59`	`if err != nil {`
`60`	`60`	`return err`
`61`	`61`	`}`
`@@ -135,8 +135,8 @@ func (s *ClusterScope) DeleteNSGs(ctx context.Context) error {`
`135`	`135`	`return nil`
`136`	`136`	`}`
`137`	`137`	`desiredNSGs := s.OCIClusterAccessor.GetNetworkSpec().Vcn.NetworkSecurityGroup`
`138`		`- for _, desiredNSG := range ptr.ToNSGSlice(desiredNSGs.List) {`
`139`		`- nsg, err := s.GetNSG(ctx, desiredNSG)`
	`138`	`+ for _, desiredNSG := range desiredNSGs.List {`
	`139`	`+ nsg, err := s.GetNSG(ctx, *desiredNSG)`
`140`	`140`	`if err != nil && !ociutil.IsNotFound(err) {`
`141`	`141`	`return err`
`142`	`142`	`}`
`@@ -484,9 +484,10 @@ func getProtocolOptionsForSpec(icmp core.IcmpOptions, tcp core.TcpOptions, udp`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`func getNsgIdFromName(nsgName string, list []infrastructurev1beta2.NSG) *string {`
`487`		`- for _, nsg := range ptr.ToNSGSlice(list) {`
`488`		`- if nsg.Name == *nsgName {`
`489`		`- return nsg.ID`
	`487`	`+ nsgSlice := ptr.ToNSGSlice(list)`
	`488`	`+ for i := range nsgSlice {`
	`489`	`+ if nsgSlice[i].Name == *nsgName {`
	`490`	`+ return nsgSlice[i].ID`
`490`	`491`	`}`
`491`	`492`	`}`
`492`	`493`	`return nil`
`@@ -496,7 +497,10 @@ func getNsgNameFromId(nsgId string, list []infrastructurev1beta2.NSG) *string`
`496`	`497`	`if nsgId == nil {`
`497`	`498`	`return nil`
`498`	`499`	`}`
`499`		`- for _, nsg := range ptr.ToNSGSlice(list) {`
	`500`	`+`
	`501`	`+ nsgSlice := ptr.ToNSGSlice(list)`
	`502`	`+ for i := range nsgSlice {`
	`503`	`+ nsg := &nsgSlice[i]`
`500`	`504`	`if nsg.ID != nil && reflect.DeepEqual(nsg.ID, nsgId) {`
`501`	`505`	`return &nsg.Name`
`502`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ import (`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {`
`35`		`- desiredSubnets := ptr.ToSubnetSlice(s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets)`
	`35`	`+ desiredSubnets := s.OCIClusterAccessor.GetNetworkSpec().Vcn.Subnets`
`36`	`36`	`for _, desiredSubnet := range desiredSubnets {`
`37`	`37`	`if desiredSubnet.Skip {`
`38`	`38`	`s.Logger.Info("Skipping Subnet reconciliation as per spec")`
`39`	`39`	`continue`
`40`	`40`	`}`
`41`		`- subnet, err := s.GetSubnet(ctx, desiredSubnet)`
	`41`	`+ subnet, err := s.GetSubnet(ctx, *desiredSubnet)`
`42`	`42`	`if err != nil {`
`43`	`43`	`return err`
`44`	`44`	`}`
`@@ -69,10 +69,10 @@ func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`- if s.IsSubnetsEqual(subnet, desiredSubnet) {`
	`72`	`+ if s.IsSubnetsEqual(subnet, *desiredSubnet) {`
`73`	`73`	`s.Logger.Info("No Reconciliation Required for Subnet", "subnet", subnetOCID)`
`74`	`74`	`} else {`
`75`		`- err = s.UpdateSubnet(ctx, desiredSubnet)`
	`75`	`+ err = s.UpdateSubnet(ctx, *desiredSubnet)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return err`
`78`	`78`	`}`
`@@ -90,7 +90,7 @@ func (s *ClusterScope) ReconcileSubnet(ctx context.Context) error {`
`90`	`90`	`s.Logger.Info("Created the security list", "ocid", seclistId)`
`91`	`91`	`desiredSubnet.SecurityList.ID = seclistId`
`92`	`92`	`}`
`93`		`- subnetId, err := s.CreateSubnet(ctx, desiredSubnet)`
	`93`	`+ subnetId, err := s.CreateSubnet(ctx, *desiredSubnet)`
`94`	`94`	`if err != nil {`
`95`	`95`	`return err`
`96`	`96`	`}`
`@@ -197,13 +197,13 @@ func (s *ClusterScope) UpdateSubnet(ctx context.Context, spec infrastructurev1be`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`func (s *ClusterScope) DeleteSubnets(ctx context.Context) error {`
`200`		`- desiredSubnets := ptr.ToSubnetSlice(s.GetSubnetsSpec())`
	`200`	`+ desiredSubnets := s.GetSubnetsSpec()`
`201`	`201`	`for _, desiredSubnet := range desiredSubnets {`
`202`	`202`	`if desiredSubnet.Skip {`
`203`	`203`	`s.Logger.Info("Skipping Subnet reconciliation as per spec")`
`204`	`204`	`continue`
`205`	`205`	`}`
`206`		`- subnet, err := s.GetSubnet(ctx, desiredSubnet)`
	`206`	`+ subnet, err := s.GetSubnet(ctx, *desiredSubnet)`
`207`	`207`	`if err != nil && !ociutil.IsNotFound(err) {`
`208`	`208`	`return err`
`209`	`209`	`}`
`@@ -325,7 +325,9 @@ func (s *ClusterScope) isControlPlaneEndpointSubnetPrivate() bool {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`func (s *ClusterScope) GetControlPlaneEndpointSubnetCidr() string {`
`328`		`- for _, subnet := range ptr.ToSubnetSlice(s.GetSubnetsSpec()) {`
	`328`	`+ subnetSlice := ptr.ToSubnetSlice(s.GetSubnetsSpec())`
	`329`	`+ for i := range subnetSlice {`
	`330`	`+ subnet := &subnetSlice[i]`
`329`	`331`	`if subnet.Role == infrastructurev1beta2.ControlPlaneEndpointRole {`
`330`	`332`	`if subnet.CIDR != "" {`
`331`	`333`	`return subnet.CIDR`
`@@ -336,7 +338,9 @@ func (s *ClusterScope) GetControlPlaneEndpointSubnetCidr() string {`
`336`	`338`	`}`
`337`	`339`
`338`	`340`	`func (s *ClusterScope) GetServiceLoadBalancerSubnetCidr() string {`
`339`		`- for _, subnet := range ptr.ToSubnetSlice(s.GetSubnetsSpec()) {`
	`341`	`+ subnetSlice := ptr.ToSubnetSlice(s.GetSubnetsSpec())`
	`342`	`+ for i := range subnetSlice {`
	`343`	`+ subnet := &subnetSlice[i]`
`340`	`344`	`if subnet.Role == infrastructurev1beta2.ServiceLoadBalancerRole {`
`341`	`345`	`if subnet.CIDR != "" {`
`342`	`346`	`return subnet.CIDR`
`@@ -347,9 +351,10 @@ func (s *ClusterScope) GetServiceLoadBalancerSubnetCidr() string {`
`347`	`351`	`}`
`348`	`352`
`349`	`353`	`func (s *ClusterScope) NodeSubnetCidr() []string {`
`350`		`- subnets := s.GetNodeSubnet()`
`351`	`354`	`var nodeCIDR []string`
`352`		`- for _, subnet := range ptr.ToSubnetSlice(subnets) {`
	`355`	`+ subnetSlice := ptr.ToSubnetSlice(s.GetNodeSubnet())`
	`356`	`+ for i := range subnetSlice {`
	`357`	`+ subnet := &subnetSlice[i]`
`353`	`358`	`if subnet.CIDR != "" {`
`354`	`359`	`nodeCIDR = append(nodeCIDR, subnet.CIDR)`
`355`	`360`	`}`
`@@ -372,7 +377,9 @@ func (s *ClusterScope) GetControlPlaneMachineSubnetCidr() string {`
`372`	`377`
`373`	`378`	`// IsAllSubnetsPrivate determines if all the ClusterScope's subnets are private`
`374`	`379`	`func (s *ClusterScope) IsAllSubnetsPrivate() bool {`
`375`		`- for _, subnet := range ptr.ToSubnetSlice(s.GetSubnetsSpec()) {`
	`380`	`+ subnetSlice := ptr.ToSubnetSlice(s.GetSubnetsSpec())`
	`381`	`+ for i := range subnetSlice {`
	`382`	`+ subnet := &subnetSlice[i]`
`376`	`383`	`if subnet.Type == infrastructurev1beta2.Public {`
`377`	`384`	`return false`
`378`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func GetNsgNamesFromId(ids []string, nsgs []*infrastructurev1beta2.NSG) []string`
`33`	`33`	`names := make([]string, 0)`
`34`	`34`	`for _, id := range ids {`
`35`	`35`	`for _, nsg := range ptr.ToNSGSlice(nsgs) {`
`36`		`- if nsg.ID != nil && id == *nsg.ID {`
	`36`	`+ if id == ptr.ToString(nsg.ID) {`
`37`	`37`	`names = append(names, nsg.Name)`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -44,7 +44,7 @@ func GetNsgNamesFromId(ids []string, nsgs []*infrastructurev1beta2.NSG) []string`
`44`	`44`	`// GetSubnetNameFromId returns the name of the Subnet with the provided ID`
`45`	`45`	`func GetSubnetNameFromId(id string, subnets []infrastructurev1beta2.Subnet) string {`
`46`	`46`	`for _, subnet := range ptr.ToSubnetSlice(subnets) {`
`47`		`- if subnet.ID != nil && id == subnet.ID {`
	`47`	`+ if ptr.ToString(id) == ptr.ToString(subnet.ID) {`
`48`	`48`	`return subnet.Name`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -56,7 +56,7 @@ func GetSubnetNamesFromId(ids []string, subnets []*infrastructurev1beta2.Subnet)`
`56`	`56`	`names := make([]string, 0)`
`57`	`57`	`for _, id := range ids {`
`58`	`58`	`for _, subnet := range ptr.ToSubnetSlice(subnets) {`
`59`		`- if subnet.ID != nil && id == *subnet.ID {`
	`59`	`+ if id == ptr.ToString(subnet.ID) {`
`60`	`60`	`names = append(names, subnet.Name)`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,15 +393,15 @@ func (m *VirtualMachinePoolScope) getWorkerMachineNSGs() []string {`
`393`	`393`	`if len(specNsgNames) > 0 {`
`394`	`394`	`for _, nsgName := range specNsgNames {`
`395`	`395`	`for _, nsg := range ptr.ToNSGSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List) {`
`396`		`- if nsg.ID != nil && nsg.Name == nsgName {`
`397`		`- nsgList = append(nsgList, *nsg.ID)`
	`396`	`+ if nsg.Name == nsgName {`
	`397`	`+ nsgList = append(nsgList, ptr.ToString(nsg.ID))`
`398`	`398`	`}`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`	`} else {`
`402`	`402`	`for _, nsg := range ptr.ToNSGSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List) {`
`403`		`- if nsg.ID != nil && nsg.Role == infrastructurev1beta2.WorkerRole {`
`404`		`- nsgList = append(nsgList, *nsg.ID)`
	`403`	`+ if nsg.Role == infrastructurev1beta2.WorkerRole {`
	`404`	`+ nsgList = append(nsgList, ptr.ToString(nsg.ID))`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`	`}`
`@@ -423,8 +423,8 @@ func (m *VirtualMachinePoolScope) getPodNSGs(nsgs []string) []string {`
`423`	`423`	`if len(nsgs) > 0 {`
`424`	`424`	`for _, nsgName := range nsgs {`
`425`	`425`	`for _, nsg := range ptr.ToNSGSlice(m.OCIManagedCluster.Spec.NetworkSpec.Vcn.NetworkSecurityGroup.List) {`
`426`		`- if nsg.ID != nil && nsg.Name == nsgName {`
`427`		`- nsgList = append(nsgList, *nsg.ID)`
	`426`	`+ if nsg.Name == nsgName {`
	`427`	`+ nsgList = append(nsgList, ptr.ToString(nsg.ID))`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`	`}`