From 746e91ec87496b2f3eda105c60fd11dde74146e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Luk=C5=A1a?= Date: Tue, 25 Apr 2023 14:52:24 +0200 Subject: [PATCH] Simplify getMeshMode() --- pkg/controller/servicemesh/memberroll/controller.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/controller/servicemesh/memberroll/controller.go b/pkg/controller/servicemesh/memberroll/controller.go index cab2a07d97..aee7bba9c8 100644 --- 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 }