@@ -64,18 +64,19 @@ var (
64
64
)
65
65
66
66
func runTrivyScans (config * rest.Config , js nats.JetStreamContext ) error {
67
- err := RunTrivyK8sClusterScan ( js )
67
+ err := RunTrivyImageScans ( config , js )
68
68
if err != nil {
69
69
return err
70
70
}
71
- // err = RunTrivyImageScans(config, js)
72
- // if err != nil {
73
- // return err
74
- // }
75
- // err = RunTrivySbomScan(config, js)
76
- // if err != nil {
77
- // return err
78
- // }
71
+ err = RunTrivySbomScan (config , js )
72
+ if err != nil {
73
+ return err
74
+ }
75
+ err = RunTrivyK8sClusterScan (js )
76
+ if err != nil {
77
+ return err
78
+ }
79
+
79
80
return nil
80
81
81
82
}
@@ -118,25 +119,23 @@ func main() {
118
119
go publishMetrics (clientset , js , clusterMetricsChan )
119
120
go server .StartServer ()
120
121
collectAndPublishMetrics := func () {
121
- // err := outDatedImages(config, js)
122
- // LogErr(err)
123
- // err = KubePreUpgradeDetector(config, js)
124
- // LogErr(err)
125
- // err = GetAllResources(config, js)
126
- // LogErr(err)
127
- // err = RakeesOutput(config, js)
128
- // LogErr(err)
122
+ err := outDatedImages (config , js )
123
+ LogErr (err )
124
+ err = KubePreUpgradeDetector (config , js )
125
+ LogErr (err )
126
+ err = GetAllResources (config , js )
127
+ LogErr (err )
128
+ err = RakeesOutput (config , js )
129
+ LogErr (err )
129
130
// getK8sEvents(clientset)
130
- err : = runTrivyScans (config , js )
131
+ err = runTrivyScans (config , js )
131
132
LogErr (err )
132
133
// err = RunKubeScore(clientset, js)
133
134
// LogErr(err)
134
135
}
135
136
136
137
collectAndPublishMetrics ()
137
- if schedulingIntervalStr == "" {
138
- schedulingIntervalStr = "20m"
139
- }
138
+
140
139
if cfg .SchedulerEnable { // Assuming "cfg.Schedule" is a boolean indicating whether to schedule or not.
141
140
scheduler := initScheduler (config , js , * cfg , clientset )
142
141
@@ -301,7 +300,7 @@ func watchK8sEvents(clientset *kubernetes.Clientset, js nats.JetStreamContext) {
301
300
func initScheduler (config * rest.Config , js nats.JetStreamContext , cfg config.AgentConfigurations , clientset * kubernetes.Clientset ) (s * Scheduler ) {
302
301
log := logging .NewLogger ()
303
302
s = NewScheduler (log )
304
- if cfg .OutdatedInterval != "" {
303
+ if cfg .OutdatedInterval != "" && cfg . OutdatedInterval != "0" {
305
304
sj , err := NewOutDatedImagesJob (config , js , cfg .OutdatedInterval )
306
305
if err != nil {
307
306
log .Fatal ("no time interval" , err )
@@ -311,7 +310,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
311
310
log .Fatal ("failed to do job" , err )
312
311
}
313
312
}
314
- if cfg .GetAllInterval != "" {
313
+ if cfg .GetAllInterval != "" && cfg . GetAllInterval != "0" {
315
314
sj , err := NewKetallJob (config , js , cfg .GetAllInterval )
316
315
if err != nil {
317
316
log .Fatal ("no time interval" , err )
@@ -321,7 +320,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
321
320
log .Fatal ("failed to do job" , err )
322
321
}
323
322
}
324
- if cfg .KubeScoreInterval != "" {
323
+ if cfg .KubeScoreInterval != "" && cfg . KubeScoreInterval != "0" {
325
324
sj , err := NewKubescoreJob (clientset , js , cfg .KubeScoreInterval )
326
325
if err != nil {
327
326
log .Fatal ("no time interval" , err )
@@ -331,7 +330,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
331
330
log .Fatal ("failed to do job" , err )
332
331
}
333
332
}
334
- if cfg .RakkessInterval != "" {
333
+ if cfg .RakkessInterval != "" && cfg . RakkessInterval != "0" {
335
334
sj , err := NewRakkessJob (config , js , cfg .RakkessInterval )
336
335
if err != nil {
337
336
log .Fatal ("no time interval" , err )
@@ -341,7 +340,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
341
340
log .Fatal ("failed to do job" , err )
342
341
}
343
342
}
344
- if cfg .KubePreUpgradeInterval != "" {
343
+ if cfg .KubePreUpgradeInterval != "" && cfg . KubePreUpgradeInterval != "0" {
345
344
sj , err := NewKubePreUpgradeJob (config , js , cfg .KubePreUpgradeInterval )
346
345
if err != nil {
347
346
log .Fatal ("no time interval" , err )
@@ -351,7 +350,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
351
350
log .Fatal ("failed to do job" , err )
352
351
}
353
352
}
354
- if cfg .TrivyInterval != "" {
353
+ if cfg .TrivyInterval != "" && cfg . TrivyInterval != "0" {
355
354
sj , err := NewTrivyJob (config , js , cfg .TrivyInterval )
356
355
if err != nil {
357
356
log .Fatal ("no time interval" , err )
0 commit comments