Simplify getMeshMode()

maistra · Apr 25, 2023 · 746e91e · 746e91e
1 parent ffe6d17
commit 746e91e
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/pkg/controller/servicemesh/memberroll/controller.go b/pkg/controller/servicemesh/memberroll/controller.go
@@ -726,15 +726,12 @@ func getNamespaces(members *maistrav1.ServiceMeshMemberList) []string {
 // Returns the Service Mesh ControlPlane mode
 // Used for the internal custom metrics
 func getMeshMode(mesh *maistrav2.ServiceMeshControlPlane) (string, error) {
- isClusterWide, found, err := mesh.Status.AppliedValues.Istio.GetBool("global.clusterWide")
+ isClusterWide, _, err := mesh.Status.AppliedValues.Istio.GetBool("global.clusterWide")
  if err != nil {
  return "", err
  }
- if !found {
- return internalmetrics.ControlPlaneModeValueMultiTenant, nil
- }
  if isClusterWide {
  return internalmetrics.ControlPlaneModeValueClusterScoped, nil
  }
- return "", nil
+ return internalmetrics.ControlPlaneModeValueMultiTenant, nil
 }