Delete Secrets when Machine is Deleted (#8)

Signed-off-by: Shaad7 <[email protected]>

Author: AbdullahAlShaad

api/v1alpha1/helper.go

@@ -77,7 +77,8 @@ func GetPhase(obj *Machine) MachinePhase {
 		}
 	}
 	if cond.Type != kmapi.ReadyCondition {
-		panic(fmt.Sprintf("no Ready condition in the status for %s/%s", obj.GetNamespace(), obj.GetName()))
+		fmt.Printf("no Ready condition in the status for %s/%s", obj.GetNamespace(), obj.GetName())
+		return MachinePhasePending
 	}
 
 	if cond.Status == metav1.ConditionTrue {
@@ -86,7 +87,7 @@ func GetPhase(obj *Machine) MachinePhase {
 
 	if cond.Reason == MachineConditionAuthDataNotFound ||
 		cond.Reason == MachineConditionScriptDataNotFound {
-		return MachinePhaseFailed
+		return MachinePhaseInProgress
 	}
 	if cond.Reason == MachineConditionMachineCreating {
 		return MachinePhaseInProgress

pkg/controller/cluster.go

@@ -47,10 +47,9 @@ func (r *MachineReconciler) isScriptFinished() (bool, error) {
 
 	err := cmd.Run()
 	if err != nil {
-		fmt.Println("Rekeying Again")
-		r.log.Info("Error checking script completion", "Error: ", commandError.String(), "Output: ", commandOutput.String())
+		r.log.Info("Error checking script completion. ReKeying. ", "CommandError: ", commandError.String(), "Output: ", commandOutput.String(), "Error: ", err.Error())
 		cutil.MarkFalse(r.machineObj, api.MachineConditionTypeScriptComplete, api.MachineConditionWaitingForScriptCompletion, kmapi.ConditionSeverityError, "failed to check script completion")
-		return true, err
+		return true, nil
 	}
 	r.log.Info("Finished Cluster Creation Script.")
 

pkg/controller/machine.go

@@ -88,7 +88,7 @@ func (r *MachineReconciler) getMachineCreationArgs() ([]string, error) {
 		scriptArgs, err := r.getStartupScriptArgs()
 		if err != nil {
 			r.log.Error(err, "unable to create script")
-			cutil.MarkFalse(r.machineObj, api.MachineConditionTypeScriptReady, err.Error(), kmapi.ConditionSeverityError, "unable to create script")
+			cutil.MarkFalse(r.machineObj, api.MachineConditionTypeScriptReady, api.MachineConditionScriptDataNotFound, kmapi.ConditionSeverityError, "unable to create script")
 			return nil, err
 		}
 		cutil.MarkTrue(r.machineObj, api.MachineConditionTypeScriptReady)
@@ -98,7 +98,7 @@ func (r *MachineReconciler) getMachineCreationArgs() ([]string, error) {
 	authArgs, err := r.getAuthSecretArgs()
 	if err != nil {
 		r.log.Error(err, "unable to read auth data")
-		cutil.MarkFalse(r.machineObj, api.MachineConditionTypeAuthDataReady, err.Error(), kmapi.ConditionSeverityError, "unable to read auth data")
+		cutil.MarkFalse(r.machineObj, api.MachineConditionTypeAuthDataReady, api.MachineConditionAuthDataNotFound, kmapi.ConditionSeverityError, "unable to read auth data")
 		return nil, err
 	}
 	cutil.MarkTrue(r.machineObj, api.MachineConditionTypeAuthDataReady)

pkg/controller/util.go

@@ -78,7 +78,6 @@ func (r *MachineReconciler) removeFinalizerAfterCleanup() error {
 		if err := r.cleanupMachineResources(); err != nil {
 			return err
 		}
-
 		if err := r.patchFinalizer(kutil.VerbDeleted, finalizerName); err != nil {
 			return err
 		}
@@ -140,6 +139,9 @@ func (r *MachineReconciler) cleanupMachineResources() error {
 func (r *MachineReconciler) patchAnnotation(key, value string) error {
 	_, err := cu.CreateOrPatch(context.TODO(), r.Client, r.machineObj, func(object client.Object, createOp bool) client.Object {
 		anno := object.GetAnnotations()
+		if anno == nil {
+			anno = make(map[string]string)
+		}
 		anno[key] = value
 		object.SetAnnotations(anno)
 		return object