diff --git a/jaeger/cmd/check.go b/jaeger/cmd/check.go index 0a663cbfb..e8d39203a 100644 --- a/jaeger/cmd/check.go +++ b/jaeger/cmd/check.go @@ -11,7 +11,6 @@ import ( "github.com/linkerd/linkerd2/pkg/healthcheck" "github.com/linkerd/linkerd2/pkg/version" "github.com/spf13/cobra" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( @@ -56,29 +55,6 @@ func jaegerCategory(hc *healthcheck.HealthChecker) *healthcheck.Category { return nil })) - checkers = append(checkers, - *healthcheck.NewChecker("collector and jaeger service account exists"). - WithHintAnchor("l5d-jaeger-sc-exists"). - Fatal(). - Warning(). - WithCheck(func(ctx context.Context) error { - // Check for Collector Service Account - return healthcheck.CheckServiceAccounts(ctx, hc.KubeAPIClient(), []string{"collector", "jaeger"}, jaegerNamespace, "") - })) - - checkers = append(checkers, - *healthcheck.NewChecker("collector config map exists"). - WithHintAnchor("l5d-jaeger-oc-cm-exists"). - Warning(). - WithCheck(func(ctx context.Context) error { - // Check for Jaeger Service Account - _, err := hc.KubeAPIClient().CoreV1().ConfigMaps(jaegerNamespace).Get(ctx, "collector-config", metav1.GetOptions{}) - if err != nil { - return err - } - return nil - })) - checkers = append(checkers, *healthcheck.NewChecker("jaeger extension pods are injected"). WithHintAnchor("l5d-jaeger-pods-injection"). @@ -93,7 +69,7 @@ func jaegerCategory(hc *healthcheck.HealthChecker) *healthcheck.Category { })) checkers = append(checkers, - *healthcheck.NewChecker("jaeger extension pods are running"). + *healthcheck.NewChecker("jaeger injector pods are running"). WithHintAnchor("l5d-jaeger-pods-running"). Warning(). WithRetryDeadline(hc.RetryDeadline). @@ -105,7 +81,7 @@ func jaegerCategory(hc *healthcheck.HealthChecker) *healthcheck.Category { } // Check for relevant pods to be present - err = healthcheck.CheckForPods(pods, []string{"collector", "jaeger", "jaeger-injector"}) + err = healthcheck.CheckForPods(pods, []string{"jaeger-injector"}) if err != nil { return err }