Remove remote rules (#4698)

Remove remote rules
GoogleContainerTools · Aug 19, 2020 · 035c89f · 035c89f
1 parent 6e98174
commit 035c89f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 312 deletions.
diff --git a/pkg/diag/download/http.go b/pkg/diag/download/http.go
diff --git a/pkg/diag/download/http_test.go b/pkg/diag/download/http_test.go
diff --git a/pkg/diag/recommender/custom.go b/pkg/diag/recommender/custom.go
diff --git a/pkg/diag/recommender/custom_test.go b/pkg/diag/recommender/custom_test.go
diff --git a/pkg/diag/validator/pod.go b/pkg/diag/validator/pod.go
@@ -74,11 +74,8 @@ type PodValidator struct {
 }
 
 // NewPodValidator initializes a PodValidator
-func NewPodValidator(k kubernetes.Interface, deployContext map[string]string) *PodValidator {
+func NewPodValidator(k kubernetes.Interface) *PodValidator {
 	rs := []Recommender{recommender.ContainerError{}}
-	if r, err := recommender.NewCustom(recommender.DiagDefaultRules, deployContext); err == nil {
-		rs = append(rs, r)
-	}
 	return &PodValidator{k: k, recos: rs}
 }
 

diff --git a/pkg/skaffold/deploy/status_check.go b/pkg/skaffold/deploy/status_check.go
@@ -53,10 +53,6 @@ const (
 	kubernetesMaxDeadline = 600
 )
 
-var (
-	deployContext map[string]string
-)
-
 type counter struct {
 	total   int
 	pending int32
@@ -76,10 +72,6 @@ func statusCheck(ctx context.Context, defaultLabeller *DefaultLabeller, runCtx *
 		return proto.StatusCode_STATUSCHECK_KUBECTL_CLIENT_FETCH_ERR, fmt.Errorf("getting Kubernetes client: %w", err)
 	}
 
-	deployContext = map[string]string{
-		"clusterName": runCtx.GetKubeContext(),
-	}
-
 	deployments := make([]*resource.Deployment, 0)
 	for _, n := range runCtx.GetNamespaces() {
 		newDeployments, err := getDeployments(client, n, defaultLabeller,
@@ -135,7 +127,7 @@ func getDeployments(client kubernetes.Interface, ns string, l *DefaultLabeller,
 		}
 		pd := diag.New([]string{d.Namespace}).
 			WithLabel(RunIDLabel, l.Labels()[RunIDLabel]).
-			WithValidators([]validator.Validator{validator.NewPodValidator(client, deployContext)})
+			WithValidators([]validator.Validator{validator.NewPodValidator(client)})
 
 		for k, v := range d.Spec.Template.Labels {
 			pd = pd.WithLabel(k, v)