Skip to content

Commit 91b3a6b

Browse files
committed
default values
1 parent a5ab558 commit 91b3a6b

File tree

2 files changed

+28
-29
lines changed

2 files changed

+28
-29
lines changed

agent/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
type AgentConfigurations struct {
99
SANamespace string `envconfig:"SA_NAMESPACE" default:"default"`
1010
SAName string `envconfig:"SA_NAME" default:"default"`
11-
OutdatedInterval string `envconfig:"OUTDATED_INTERVAL" default:"@every 20m"`
11+
OutdatedInterval string `envconfig:"OUTDATED_INTERVAL" default:"0"`
1212
GetAllInterval string `envconfig:"GETALL_INTERVAL" default:"*/30 * * * *"`
1313
KubeScoreInterval string `envconfig:"KUBESCORE_INTERVAL" default:"*/40 * * * *"`
1414
RakkessInterval string `envconfig:"RAKKESS_INTERVAL" default:"*/50 * * * *"`
1515
KubePreUpgradeInterval string `envconfig:"KUBEPREUPGRADE_INTERVAL" default:"*/60 * * * *"`
1616
TrivyInterval string `envconfig:"TRIVY_INTERVAL" default:"*/10 * * * *"`
17-
SchedulerEnable bool `envconfig:"SCHEDULER_ENABLE" default:"false"`
17+
SchedulerEnable bool `envconfig:"SCHEDULER_ENABLE" default:"true"`
1818
}
1919

2020
func GetAgentConfigurations() (serviceConf *AgentConfigurations, err error) {

agent/kubviz/k8smetrics_agent.go

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,19 @@ var (
6464
)
6565

6666
func runTrivyScans(config *rest.Config, js nats.JetStreamContext) error {
67-
err := RunTrivyK8sClusterScan(js)
67+
err := RunTrivyImageScans(config, js)
6868
if err != nil {
6969
return err
7070
}
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+
7980
return nil
8081

8182
}
@@ -118,25 +119,23 @@ func main() {
118119
go publishMetrics(clientset, js, clusterMetricsChan)
119120
go server.StartServer()
120121
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)
129130
// getK8sEvents(clientset)
130-
err := runTrivyScans(config, js)
131+
err = runTrivyScans(config, js)
131132
LogErr(err)
132133
// err = RunKubeScore(clientset, js)
133134
// LogErr(err)
134135
}
135136

136137
collectAndPublishMetrics()
137-
if schedulingIntervalStr == "" {
138-
schedulingIntervalStr = "20m"
139-
}
138+
140139
if cfg.SchedulerEnable { // Assuming "cfg.Schedule" is a boolean indicating whether to schedule or not.
141140
scheduler := initScheduler(config, js, *cfg, clientset)
142141

@@ -301,7 +300,7 @@ func watchK8sEvents(clientset *kubernetes.Clientset, js nats.JetStreamContext) {
301300
func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.AgentConfigurations, clientset *kubernetes.Clientset) (s *Scheduler) {
302301
log := logging.NewLogger()
303302
s = NewScheduler(log)
304-
if cfg.OutdatedInterval != "" {
303+
if cfg.OutdatedInterval != "" && cfg.OutdatedInterval != "0" {
305304
sj, err := NewOutDatedImagesJob(config, js, cfg.OutdatedInterval)
306305
if err != nil {
307306
log.Fatal("no time interval", err)
@@ -311,7 +310,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
311310
log.Fatal("failed to do job", err)
312311
}
313312
}
314-
if cfg.GetAllInterval != "" {
313+
if cfg.GetAllInterval != "" && cfg.GetAllInterval != "0" {
315314
sj, err := NewKetallJob(config, js, cfg.GetAllInterval)
316315
if err != nil {
317316
log.Fatal("no time interval", err)
@@ -321,7 +320,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
321320
log.Fatal("failed to do job", err)
322321
}
323322
}
324-
if cfg.KubeScoreInterval != "" {
323+
if cfg.KubeScoreInterval != "" && cfg.KubeScoreInterval != "0" {
325324
sj, err := NewKubescoreJob(clientset, js, cfg.KubeScoreInterval)
326325
if err != nil {
327326
log.Fatal("no time interval", err)
@@ -331,7 +330,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
331330
log.Fatal("failed to do job", err)
332331
}
333332
}
334-
if cfg.RakkessInterval != "" {
333+
if cfg.RakkessInterval != "" && cfg.RakkessInterval != "0" {
335334
sj, err := NewRakkessJob(config, js, cfg.RakkessInterval)
336335
if err != nil {
337336
log.Fatal("no time interval", err)
@@ -341,7 +340,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
341340
log.Fatal("failed to do job", err)
342341
}
343342
}
344-
if cfg.KubePreUpgradeInterval != "" {
343+
if cfg.KubePreUpgradeInterval != "" && cfg.KubePreUpgradeInterval != "0" {
345344
sj, err := NewKubePreUpgradeJob(config, js, cfg.KubePreUpgradeInterval)
346345
if err != nil {
347346
log.Fatal("no time interval", err)
@@ -351,7 +350,7 @@ func initScheduler(config *rest.Config, js nats.JetStreamContext, cfg config.Age
351350
log.Fatal("failed to do job", err)
352351
}
353352
}
354-
if cfg.TrivyInterval != "" {
353+
if cfg.TrivyInterval != "" && cfg.TrivyInterval != "0" {
355354
sj, err := NewTrivyJob(config, js, cfg.TrivyInterval)
356355
if err != nil {
357356
log.Fatal("no time interval", err)

0 commit comments

Comments
 (0)