Merge branch 'main' into update-clusterctl

.github/workflows/lint.yml

@@ -1,3 +1,4 @@
+---
 name: Lint
 
 on:
@@ -10,7 +11,7 @@ on:
 
 jobs:
   lint:
-    name: Run on Ubuntu
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code

.github/workflows/release-drafter.yaml

@@ -11,6 +11,7 @@ permissions:
 
 jobs:
   build:
+    name: Release Drafter
     runs-on: ubuntu-latest
     steps:
       - name: Draft Release

.github/workflows/test-e2e.yml

@@ -1,3 +1,4 @@
+---
 name: E2E Tests
 
 on:
@@ -10,7 +11,7 @@ on:
 
 jobs:
   test-e2e:
-    name: Run on Ubuntu
+    name: E2E Tests
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code

.github/workflows/test.yml

@@ -1,3 +1,4 @@
+---
 name: Tests
 
 on:
@@ -10,7 +11,7 @@ on:
 
 jobs:
   test:
-    name: Run on Ubuntu
+    name: Tests
     runs-on: ubuntu-latest
     steps:
       - name: Clone the code

internal/controller/metalstackmachine_controller.go

@@ -532,6 +532,10 @@ func (r *machineReconciler) getMachineAddresses(m *models.V1MachineResponse) clu
 }
 
 func (r *machineReconciler) findProviderMachine() (*models.V1MachineResponse, error) {
+	if r.infraMachine.Spec.ProviderID == "" {
+		return nil, errProviderMachineNotFound
+	}
+
 	resp, err := r.metalClient.Machine().FindMachine(metalmachine.NewFindMachineParams().WithContext(r.ctx).WithID(decodeProviderID(r.infraMachine.Spec.ProviderID)), nil)
 
 	var errResp *metalmachine.FindMachineDefault