Update integration tests

Signed-off-by: Alex Leong <[email protected]>

Author: adleong

pkg/healthcheck/healthcheck_multicluster.go

@@ -235,6 +235,10 @@ func (hc *HealthChecker) checkServiceMirrorLocalRBAC() error {
 		return fmt.Errorf(strings.Join(errors, "\n"))
 	}
 
+	if len(links) == 0 {
+		return &SkipError{Reason: "no links"}
+	}
+
 	return &VerboseSuccess{Message: strings.Join(links, "\n")}
 }
 
@@ -271,6 +275,11 @@ func (hc *HealthChecker) checkServiceMirrorController() error {
 	if len(errors) > 0 {
 		return joinErrors(errors, 2)
 	}
+
+	if len(clusterNames) == 0 {
+		return &SkipError{Reason: "no links"}
+	}
+
 	return &VerboseSuccess{Message: strings.Join(clusterNames, "\n")}
 }
 
@@ -329,6 +338,11 @@ func (hc *HealthChecker) checkRemoteClusterConnectivity() error {
 	if len(errors) > 0 {
 		return joinErrors(errors, 2)
 	}
+
+	if len(links) == 0 {
+		return &SkipError{Reason: "no links"}
+	}
+
 	return &VerboseSuccess{Message: strings.Join(links, "\n")}
 }
 
@@ -404,6 +418,10 @@ func (hc *HealthChecker) checkRemoteClusterAnchors() error {
 		return fmt.Errorf("Problematic clusters:\n    %s", strings.Join(errors, "\n    "))
 	}
 
+	if len(links) == 0 {
+		return &SkipError{Reason: "no links"}
+	}
+
 	return &VerboseSuccess{Message: strings.Join(links, "\n")}
 }
 
@@ -466,6 +484,11 @@ func (hc *HealthChecker) checkIfGatewayMirrorsHaveEndpoints(ctx context.Context)
 	if len(errors) > 0 {
 		return joinErrors(errors, 1)
 	}
+
+	if len(links) == 0 {
+		return &SkipError{Reason: "no links"}
+	}
+
 	return &VerboseSuccess{Message: strings.Join(links, "\n")}
 }
 
@@ -491,6 +514,11 @@ func (hc *HealthChecker) checkIfMirrorServicesHaveEndpoints() error {
 	if len(servicesWithNoEndpoints) > 0 {
 		return fmt.Errorf("Some mirror services do not have endpoints:\n    %s", strings.Join(servicesWithNoEndpoints, "\n    "))
 	}
+
+	if len(mirrorServices.Items) == 0 {
+		return &SkipError{Reason: "no mirror services"}
+	}
+
 	return nil
 }
 
@@ -522,6 +550,10 @@ func (hc *HealthChecker) checkForOrphanedServices() error {
 		}
 	}
 
+	if len(mirrorServices.Items) == 0 {
+		return &SkipError{Reason: "no mirror services"}
+	}
+
 	if len(errors) > 0 {
 		return joinErrors(errors, 1)
 	}

test/testdata/check.multicluster.golden

@@ -68,17 +68,8 @@ linkerd-grafana
 √ grafana add-on config map exists
 √ grafana pod is running
 
-linkerd-multicluster-source
+linkerd-multicluster
 ---------------------------
-√ service mirror controller is running
-√ service mirror controller ClusterRoles exist
-√ service mirror controller ClusterRoleBindings exist
-√ service mirror controller Roles exist
-√ service mirror controller RoleBindings exist
-√ service mirror controller ServiceAccounts exist
-√ service mirror controller has required permissions
-√ multicluster daisy chaining is avoided
-√ all mirror services have endpoints
-√ all gateway mirrors have endpoints
+√ Link CRD exists
 
 Status check results are √

test/testdata/check.multicluster.proxy.golden

@@ -75,17 +75,8 @@ linkerd-grafana
 √ grafana add-on config map exists
 √ grafana pod is running
 
-linkerd-multicluster-source
+linkerd-multicluster
 ---------------------------
-√ service mirror controller is running
-√ service mirror controller ClusterRoles exist
-√ service mirror controller ClusterRoleBindings exist
-√ service mirror controller Roles exist
-√ service mirror controller RoleBindings exist
-√ service mirror controller ServiceAccounts exist
-√ service mirror controller has required permissions
-√ multicluster daisy chaining is avoided
-√ all mirror services have endpoints
-√ all gateway mirrors have endpoints
+√ Link CRD exists
 
 Status check results are √

testutil/test_helper.go

@@ -113,8 +113,7 @@ func NewGenericTestHelper(
 // MulticlusterDeployReplicas is a map containing the number of replicas for each Deployment and the main
 // container name for multicluster components
 var MulticlusterDeployReplicas = map[string]DeploySpec{
-	"linkerd-gateway":        {1, []string{"nginx"}},
-	"linkerd-service-mirror": {1, []string{"service-mirror"}},
+	"linkerd-gateway": {1, []string{"nginx"}},
 }
 
 // NewTestHelper creates a new instance of TestHelper for the current test run.