Skip to content

Commit

Permalink
fix: exclude node collector scanning (#3771)
Browse files Browse the repository at this point in the history
  • Loading branch information
chen-keinan committed Mar 13, 2023
1 parent 20f1067 commit bd9c6e6
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions pkg/k8s/commands/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,34 @@ package commands
import (
"context"

"golang.org/x/exp/slices"
"golang.org/x/xerrors"

"github.com/aquasecurity/trivy-kubernetes/pkg/artifacts"
"github.com/aquasecurity/trivy-kubernetes/pkg/k8s"
"github.com/aquasecurity/trivy-kubernetes/pkg/trivyk8s"
"github.com/aquasecurity/trivy/pkg/flag"
"github.com/aquasecurity/trivy/pkg/log"

"golang.org/x/xerrors"
"github.com/aquasecurity/trivy/pkg/types"
)

// clusterRun runs scan on kubernetes cluster
func clusterRun(ctx context.Context, opts flag.Options, cluster k8s.Cluster) error {
if err := validateReportArguments(opts); err != nil {
return err
}

artifacts, err := trivyk8s.New(cluster, log.Logger).ListArtifactAndNodeInfo(ctx)
if err != nil {
return xerrors.Errorf("get k8s artifacts error: %w", err)
var artifacts []*artifacts.Artifact
var err error
if opts.Scanners.AnyEnabled(types.MisconfigScanner) && slices.Contains(opts.Components, "infra") {
artifacts, err = trivyk8s.New(cluster, log.Logger).ListArtifactAndNodeInfo(ctx)
if err != nil {
return xerrors.Errorf("get k8s artifacts with node info error: %w", err)
}
} else {
artifacts, err = trivyk8s.New(cluster, log.Logger).ListArtifacts(ctx)
if err != nil {
return xerrors.Errorf("get k8s artifacts error: %w", err)
}
}

runner := newRunner(opts, cluster.GetCurrentContext())
Expand Down

0 comments on commit bd9c6e6

Please sign in to comment.