fix(bastion): public ip unlink

outscale · Aug 21, 2024 · 20beff9 · 20beff9
1 parent bee800c
commit 20beff9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/controllers/osccluster_bastion_controller.go b/controllers/osccluster_bastion_controller.go
@@ -368,9 +368,12 @@ func reconcileDeleteBastion(ctx context.Context, clusterScope *scope.ClusterScop
 	if bastionSpec.PublicIpName != "" {
 		linkPublicIpRef := clusterScope.GetLinkPublicIpRef()
 		publicIpName := bastionSpec.PublicIpName + "-" + clusterScope.GetUID()
-		err = publicIpSvc.UnlinkPublicIp(linkPublicIpRef.ResourceMap[publicIpName])
-		if err != nil {
-			return reconcile.Result{}, fmt.Errorf("%w Can not unlink publicIp for OscCluster %s/%s", err, clusterScope.GetNamespace(), clusterScope.GetName())
+		publicIpRef := linkPublicIpRef.ResourceMap[publicIpName]
+		if publicIpRef != "" {
+			err = publicIpSvc.UnlinkPublicIp(publicIpRef)
+			if err != nil {
+				return reconcile.Result{}, fmt.Errorf("%w Can not unlink publicIp for OscCluster %s/%s", err, clusterScope.GetNamespace(), clusterScope.GetName())
+			}
 		}
 	}
 	err = vmSvc.DeleteVm(vmId)

diff --git a/controllers/oscmachine_vm_controller.go b/controllers/oscmachine_vm_controller.go
@@ -603,9 +603,12 @@ func reconcileDeleteVm(ctx context.Context, clusterScope *scope.ClusterScope, ma
 	if vmSpec.PublicIpName != "" {
 		linkPublicIpRef := machineScope.GetLinkPublicIpRef()
 		publicIpName := vmSpec.PublicIpName + "-" + clusterScope.GetUID()
-		err = publicIpSvc.UnlinkPublicIp(linkPublicIpRef.ResourceMap[publicIpName])
-		if err != nil {
-			return reconcile.Result{}, fmt.Errorf("%w Can not unlink publicIp for OscCluster %s/%s", err, machineScope.GetNamespace(), machineScope.GetName())
+		linkPublicIiId := linkPublicIpRef.ResourceMap[publicIpName]
+		if linkPublicIiId != "" {
+			err = publicIpSvc.UnlinkPublicIp(linkPublicIiId)
+			if err != nil {
+				return reconcile.Result{}, fmt.Errorf("%w Can not unlink publicIp for OscCluster %s/%s", err, machineScope.GetNamespace(), machineScope.GetName())
+			}
 		}
 	}
 	if vmSpec.PublicIp {

diff --git a/controllers/oscmachine_volume_controller_unit_test.go b/controllers/oscmachine_volume_controller_unit_test.go
@@ -342,7 +342,7 @@ func TestReconcileVolumeResourceId(t *testing.T) {
 			expVolumeFound:                    true,
 			expSubnetFound:                    true,
 			expPublicIpFound:                  false,
-			expLinkPublicIpFound:              true,
+			expLinkPublicIpFound:              false,
 			expSecurityGroupFound:             true,
 			expLoadBalancerSecurityGroupFound: true,
 			expTagFound:                       false,