Merge pull request #153 from weaveworks/release_tidy

richardcase · web-flow · commit 377b92f22257 · 2022-04-05T14:12:47.000+01:00
chore: tidy up for the v0.5.0 release
diff --git a/controllers/microvmmachine_controller.go b/controllers/microvmmachine_controller.go
@@ -298,7 +298,8 @@ func (r *MicrovmMachineReconciler) reconcileNormal(
 	return r.parseMicroVMState(machineScope, microvm.Status.State)
 }
 
-func (r *MicrovmMachineReconciler) getMicrovmService(addr string,
+func (r *MicrovmMachineReconciler) getMicrovmService(
+	addr string,
 	machineScope *scope.MachineScope) (*microvm.Service, error) {
 	if r.MvmClientFunc == nil {
 		return nil, errClientFactoryFuncRequired
diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -4,6 +4,7 @@ This table shows the compatibility between CAPMVM and Flintlock versions.
 
 | CAPMVM      | Flintlock              |
 | ----------- | ---------------------- |
+| `v0.5.0`    | `v0.1.0-alpha.9`       |
 | `v0.4.0`    | `v0.1.0-alpha.8`       |
 | `v0.3.0`    | `v0.1.0-alpha.6`       |
 | `v0.2.2`    | `v0.1.0-alpha.5`       |
diff --git a/internal/scope/machine.go b/internal/scope/machine.go
@@ -172,9 +172,7 @@ func (m *MachineScope) GetFailureDomain() (string, error) {
 
 	providerID := m.GetProviderID()
 	if providerID != "" {
-		failureDomain := m.getFailureDomainFromProviderID(providerID)
-
-		return failureDomain, nil
+		return m.getFailureDomainFromProviderID(providerID), nil
 	}
 
 	// If we've got this far then we need to work out how to get a failure domain. In the future we will make

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,8 @@ func (r *MicrovmMachineReconciler) reconcileNormal(`
`298`	`298`	`return r.parseMicroVMState(machineScope, microvm.Status.State)`
`299`	`299`	`}`
`300`	`300`
`301`		`-func (r *MicrovmMachineReconciler) getMicrovmService(addr string,`
	`301`	`+func (r *MicrovmMachineReconciler) getMicrovmService(`
	`302`	`+ addr string,`
`302`	`303`	`machineScope scope.MachineScope) (microvm.Service, error) {`
`303`	`304`	`if r.MvmClientFunc == nil {`
`304`	`305`	`return nil, errClientFactoryFuncRequired`
Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,7 @@ func (m *MachineScope) GetFailureDomain() (string, error) {`
`172`	`172`
`173`	`173`	`providerID := m.GetProviderID()`
`174`	`174`	`if providerID != "" {`
`175`		`- failureDomain := m.getFailureDomainFromProviderID(providerID)`
`176`		`-`
`177`		`- return failureDomain, nil`
	`175`	`+ return m.getFailureDomainFromProviderID(providerID), nil`
`178`	`176`	`}`
`179`	`177`
`180`	`178`	`// If we've got this far then we need to work out how to get a failure domain. In the future we will make`