Merge pull request #241 from intelops/helmvalues

Helmvalues

Author: jebinjeb

agent/config/config.go

@@ -8,7 +8,7 @@ import (
 type AgentConfigurations struct {
 	SANamespace            string `envconfig:"SA_NAMESPACE" default:"default"`
 	SAName                 string `envconfig:"SA_NAME" default:"default"`
-	OutdatedInterval       string `envconfig:"OUTDATED_INTERVAL" default:"*/20 * * * *"`
+	OutdatedInterval       string `envconfig:"OUTDATED_INTERVAL" default:"@every 20m"`
 	GetAllInterval         string `envconfig:"GETALL_INTERVAL" default:"*/30 * * * *"`
 	KubeScoreInterval      string `envconfig:"KUBESCORE_INTERVAL" default:"*/40 * * * *"`
 	RakkessInterval        string `envconfig:"RAKKESS_INTERVAL" default:"*/50 * * * *"`

agent/git/pkg/config/configuration.go

@@ -3,7 +3,7 @@ package config
 // var token string = "UfmrJOYwYCCsgQvxvcfJ3BdI6c8WBbnD"
 // var natsurl string = "nats://localhost:4222"
 
-//Config will have the configuration details
+// Config will have the configuration details
 type Config struct {
 	NatsAddress string `envconfig:"NATS_ADDRESS"`
 	NatsToken   string `envconfig:"NATS_TOKEN"`

agent/kubviz/k8smetrics_agent.go

@@ -53,7 +53,9 @@ const (
 var (
 	ClusterName string = os.Getenv("CLUSTER_NAME")
 	token       string = os.Getenv("NATS_TOKEN")
-	natsurl     string = os.Getenv("NATS_ADDRESS")
+
+	natsurl string = os.Getenv("NATS_ADDRESS")
+
 	//for local testing provide the location of kubeconfig
 	// inside the civo file paste your kubeconfig
 	// uncomment this line from Dockerfile.Kubviz (COPY --from=builder /workspace/civo /etc/myapp/civo)

charts/agent/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.0
+version: 1.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/agent/templates/deployment.yaml

@@ -53,7 +53,21 @@ spec:
           - name: NATS_ADDRESS
             value: {{ .Values.nats.host }}
           - name: SCHEDULING_INTERVAL
-            value: {{ .Values.schedulingInterval }}
+            value: {{ .Values.schedule.schedulingInterval }}
+          - name: SCHEDULER_ENABLE
+            value: {{ .Values.schedule.enabled }}
+          - name: OUTDATED_INTERVAL
+            value: {{ .Values.schedule.outdatedInterval }}
+          - name: GETALL_INTERVAL
+            value: {{ .Values.schedule.getallInterval }}
+          - name: KUBESCORE_INTERVAL
+            value: {{ .Values.schedule.kubescoreInterval }}
+          - name: RAKKESS_INTERVAL
+            value: {{ .Values.schedule.rakkessInterval }}
+          - name: KUBEPREUPGRADE_INTERVAL
+            value: {{ .Values.schedule.kubepreupgradeInterval }}
+          - name: TRIVY_INTERVAL
+            value: {{ .Values.TrivyInterval }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
 {{- if .Values.git_bridge.enabled }}

charts/agent/values.yaml

@@ -142,7 +142,15 @@ tolerations: []
 
 affinity: {}
 
-schedulingInterval: "24h"
+schedule:
+  enabled: false
+  schedulingInterval: "24h"
+  outdatedInterval: "@every 18h"
+  getallInterval: "@every 19h"
+  kubescoreInterval: "@every 20h"
+  rakkessInterval: "@every 21h"
+  kubepreupgradeInterval: "@every 22h"
+  trivyInterval: "@every 24h"
 
 clusterName: "kubviz"
 nats: