Add support for multiple CIDR in vcn and fix dns label bug

shyamradhakrishnan · shyamradhakrishnan · commit 3cd2051d5042 · 2024-07-23T10:16:12.000+05:30
diff --git a/cloud/scope/vcn_reconciler.go b/cloud/scope/vcn_reconciler.go
@@ -37,7 +37,7 @@ func (s *ClusterScope) ReconcileVCN(ctx context.Context) error {
 	}
 	if vcn != nil {
 		s.OCIClusterAccessor.GetNetworkSpec().Vcn.ID = vcn.Id
-		if s.IsVcnEquals(vcn, spec) {
+		if s.IsVcnEquals(vcn) {
 			s.Logger.Info("No Reconciliation Required for VCN", "vcn", s.getVcnId())
 			return nil
 		}
@@ -48,8 +48,8 @@ func (s *ClusterScope) ReconcileVCN(ctx context.Context) error {
 	return err
 }
 
-func (s *ClusterScope) IsVcnEquals(actual *core.Vcn, desired infrastructurev1beta2.VCN) bool {
-	if *actual.DisplayName != desired.Name {
+func (s *ClusterScope) IsVcnEquals(actual *core.Vcn) bool {
+	if *actual.DisplayName != s.GetVcnName() {
 		return false
 	}
 	return true
@@ -106,7 +106,7 @@ func (s *ClusterScope) GetVCN(ctx context.Context) (*core.Vcn, error) {
 
 func (s *ClusterScope) UpdateVCN(ctx context.Context, vcn infrastructurev1beta2.VCN) error {
 	updateVCNDetails := core.UpdateVcnDetails{
-		DisplayName: common.String(vcn.Name),
+		DisplayName: common.String(s.GetVcnName()),
 	}
 	vcnResponse, err := s.VCNClient.UpdateVcn(ctx, core.UpdateVcnRequest{
 		UpdateVcnDetails: updateVCNDetails,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (s *ClusterScope) ReconcileVCN(ctx context.Context) error {`
`37`	`37`	`}`
`38`	`38`	`if vcn != nil {`
`39`	`39`	`s.OCIClusterAccessor.GetNetworkSpec().Vcn.ID = vcn.Id`
`40`		`- if s.IsVcnEquals(vcn, spec) {`
	`40`	`+ if s.IsVcnEquals(vcn) {`
`41`	`41`	`s.Logger.Info("No Reconciliation Required for VCN", "vcn", s.getVcnId())`
`42`	`42`	`return nil`
`43`	`43`	`}`
`@@ -48,8 +48,8 @@ func (s *ClusterScope) ReconcileVCN(ctx context.Context) error {`
`48`	`48`	`return err`
`49`	`49`	`}`
`50`	`50`
`51`		`-func (s ClusterScope) IsVcnEquals(actual core.Vcn, desired infrastructurev1beta2.VCN) bool {`
`52`		`- if *actual.DisplayName != desired.Name {`
	`51`	`+func (s ClusterScope) IsVcnEquals(actual core.Vcn) bool {`
	`52`	`+ if *actual.DisplayName != s.GetVcnName() {`
`53`	`53`	`return false`
`54`	`54`	`}`
`55`	`55`	`return true`
`@@ -106,7 +106,7 @@ func (s ClusterScope) GetVCN(ctx context.Context) (core.Vcn, error) {`
`106`	`106`
`107`	`107`	`func (s *ClusterScope) UpdateVCN(ctx context.Context, vcn infrastructurev1beta2.VCN) error {`
`108`	`108`	`updateVCNDetails := core.UpdateVcnDetails{`
`109`		`- DisplayName: common.String(vcn.Name),`
	`109`	`+ DisplayName: common.String(s.GetVcnName()),`
`110`	`110`	`}`
`111`	`111`	`vcnResponse, err := s.VCNClient.UpdateVcn(ctx, core.UpdateVcnRequest{`
`112`	`112`	`UpdateVcnDetails: updateVCNDetails,`