Merge pull request #4557 from vincepri/fix-secret-not-found

k8s-ci-robot · web-flow · commit f88f0fa620fe · 2023-10-12T11:33:35.000+02:00
🐛 On deletion, should ignore if the secret cannot be found
diff --git a/controllers/awsmachine_controller.go b/controllers/awsmachine_controller.go
@@ -809,7 +809,7 @@ func getIgnitionVersion(scope *scope.MachineScope) string {
 
 func (r *AWSMachineReconciler) deleteBootstrapData(machineScope *scope.MachineScope, clusterScope cloud.ClusterScoper, objectStoreScope scope.S3Scope) error {
 	_, userDataFormat, err := machineScope.GetRawBootstrapDataWithFormat()
-	if err != nil {
+	if client.IgnoreNotFound(err) != nil {
 		return errors.Wrap(err, "failed to get raw userdata")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ func getIgnitionVersion(scope *scope.MachineScope) string {`
`809`	`809`
`810`	`810`	`func (r AWSMachineReconciler) deleteBootstrapData(machineScope scope.MachineScope, clusterScope cloud.ClusterScoper, objectStoreScope scope.S3Scope) error {`
`811`	`811`	`_, userDataFormat, err := machineScope.GetRawBootstrapDataWithFormat()`
`812`		`- if err != nil {`
	`812`	`+ if client.IgnoreNotFound(err) != nil {`
`813`	`813`	`return errors.Wrap(err, "failed to get raw userdata")`
`814`	`814`	`}`
`815`	`815`