Merge pull request #3805 from enxebre/fix-awsmachine-deletion

k8s-ci-robot · web-flow · commit 1a2bd94b4357 · 2023-07-03T00:38:51.000-07:00
Do not return error if secret does not exist
diff --git a/controllers/awsmachine_controller.go b/controllers/awsmachine_controller.go
@@ -803,7 +803,7 @@ func (r *AWSMachineReconciler) deleteIgnitionBootstrapDataFromS3(machineScope *s
 	}
 
 	_, userDataFormat, err := machineScope.GetRawBootstrapDataWithFormat()
-	if err != nil {
+	if err != nil && !apierrors.IsNotFound(err) {
 		r.Recorder.Eventf(machineScope.AWSMachine, corev1.EventTypeWarning, "FailedGetBootstrapData", err.Error())
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ func (r AWSMachineReconciler) deleteIgnitionBootstrapDataFromS3(machineScope s`
`803`	`803`	`}`
`804`	`804`
`805`	`805`	`_, userDataFormat, err := machineScope.GetRawBootstrapDataWithFormat()`
`806`		`- if err != nil {`
	`806`	`+ if err != nil && !apierrors.IsNotFound(err) {`
`807`	`807`	`r.Recorder.Eventf(machineScope.AWSMachine, corev1.EventTypeWarning, "FailedGetBootstrapData", err.Error())`
`808`	`808`	`return err`
`809`	`809`	`}`