metropolis/node/core/roleserve: simplify returning boolean expression
Change-Id: I82af117bab94b3acf51889fb0d2ebe6e58d96cc2
Reviewed-on: https://review.monogon.dev/c/monogon/+/3010
Vouch-Run-CI: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/node/core/roleserve/worker_controlplane.go b/metropolis/node/core/roleserve/worker_controlplane.go
index b6846a0..d5a60fc 100644
--- a/metropolis/node/core/roleserve/worker_controlplane.go
+++ b/metropolis/node/core/roleserve/worker_controlplane.go
@@ -74,11 +74,8 @@
func (c *controlPlaneStartup) changed(o *controlPlaneStartup) bool {
hasConsensusA := c.consensusConfig != nil
hasConsensusB := o.consensusConfig != nil
- if hasConsensusA != hasConsensusB {
- return true
- }
- return false
+ return hasConsensusA != hasConsensusB
}
func (s *workerControlPlane) run(ctx context.Context) error {
diff --git a/metropolis/node/core/roleserve/worker_kubernetes.go b/metropolis/node/core/roleserve/worker_kubernetes.go
index 3c05551..e8c96c6 100644
--- a/metropolis/node/core/roleserve/worker_kubernetes.go
+++ b/metropolis/node/core/roleserve/worker_kubernetes.go
@@ -54,21 +54,15 @@
func (k *kubernetesStartup) workerChanged(o *kubernetesStartup) bool {
hasKubernetesA := k.roles.KubernetesWorker != nil
hasKubernetesB := o.roles.KubernetesWorker != nil
- if hasKubernetesA != hasKubernetesB {
- return true
- }
- return false
+ return hasKubernetesA != hasKubernetesB
}
func (k *kubernetesStartup) controllerChanged(o *kubernetesStartup) bool {
hasKubernetesA := k.roles.KubernetesController != nil
hasKubernetesB := o.roles.KubernetesController != nil
- if hasKubernetesA != hasKubernetesB {
- return true
- }
- return false
+ return hasKubernetesA != hasKubernetesB
}
func (s *workerKubernetes) run(ctx context.Context) error {