Skip to content

Commit 002c868

Browse files
committed
added pvc in trivy image
1 parent 65a855f commit 002c868

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

agent/kubviz/kubePreUpgrade.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ func KubePreUpgradeDetector(config *rest.Config, js nats.JetStreamContext) error
104104

105105
func PopulateKubeAPIMap(swagfile string) (model.KubernetesAPIs, error) {
106106
var kubeAPIs = make(model.KubernetesAPIs)
107-
// log.Infof("Populating the PopulateKubeAPIMap")
108107
jsonFile, err := os.Open(swagfile)
109108
if err != nil {
110109
log.Error(err)

agent/kubviz/outdated.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,6 @@ func splitOutlierSemvers(allSemverTags []*semver.Version) ([]*semver.Version, []
447447
return outliers, remaining, nil
448448
}
449449

450-
// func homeDir() string {
451-
// if h := os.Getenv("HOME"); h != "" {
452-
// return h
453-
// }
454-
// return os.Getenv("USERPROFILE")
455-
// }
456-
457450
type VersionTag struct {
458451
Sort int `json:"sort"`
459452
Version string `json:"version"`

agent/kubviz/trivy_image.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"encoding/json"
5+
"fmt"
56
"log"
67
"os"
78
"strings"
@@ -15,6 +16,15 @@ import (
1516
)
1617

1718
func RunTrivyImageScans(config *rest.Config, js nats.JetStreamContext) error {
19+
20+
pvcMountPath := "/mnt/agent/kbz"
21+
trivyImageCacheDir := fmt.Sprintf("%s/trivy-imagecache", pvcMountPath)
22+
err := os.MkdirAll(trivyImageCacheDir, 0755)
23+
if err != nil {
24+
log.Printf("Error creating Trivy Image cache directory: %v\n", err)
25+
return err
26+
}
27+
1828
clearCacheCmd := "trivy image --clear-cache"
1929

2030
images, err := ListImages(config)
@@ -25,7 +35,8 @@ func RunTrivyImageScans(config *rest.Config, js nats.JetStreamContext) error {
2535

2636
for _, image := range images {
2737
var report types.Report
28-
out, err := executeCommand("trivy image " + image.PullableImage + " --timeout 60m -f json -q --cache-dir /tmp/.cache")
38+
scanCmd := fmt.Sprintf("trivy image %s --timeout 60m -f json -q --cache-dir %s", image.PullableImage, trivyImageCacheDir)
39+
out, err := executeCommand(scanCmd)
2940
if err != nil {
3041
log.Printf("Error scanning image %s: %v", image.PullableImage, err)
3142
continue // Move on to the next image in case of an error

0 commit comments

Comments
 (0)