rewrite node-agent config

Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
kubescape · Jul 12, 2023 · f8f6609 · f8f6609
1 parent 65057cd
commit f8f6609
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 32 deletions.
diff --git a/charts/kubescape-cloud-operator/templates/node-agent/configmap.yaml b/charts/kubescape-cloud-operator/templates/node-agent/configmap.yaml
@@ -2,30 +2,13 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
- name: {{ .Values.nodeAgent.config.name }}
+ name: {{ .Values.nodeAgent.name }}
  namespace: {{ .Values.ksNamespace }}
 data:
- ConfigurationFile.json: |
+ config.json: |
  {
- "sniffer": {
- "services": [
- {
- "Name": "relevantCVEs"
- }
- ],
- "maxSniffingTimePerContainer": {{ .Values.nodeAgent.config.maxLearningPeriod }}
- },
- "falcoEbpfEngine": {
- "kernelObjPath": "/root/.falco/falco-bpf.o",
- "ebpfEngineLoaderPath": "/etc/node-agent/resources/ebpf/falco/userspace_app"
- },
- "node": {
- "name": ""
- },
- "db": {
- "updateDataPeriod": {{ .Values.nodeAgent.config.learningPeriod }}
- },
- "clusterName": "{{ regexReplaceAll "\\W+" .Values.clusterName "-" }}",
- "accountID": "{{ .Values.account }}"
+ "relevantCVEServiceEnabled": true,
+ "maxSniffingTimePerContainer": "{{ .Values.nodeAgent.config.maxLearningPeriod }}",
+ "updateDataPeriod": "{{ .Values.nodeAgent.config.learningPeriod }}"
  }
 {{- end }}
diff --git a/charts/kubescape-cloud-operator/templates/node-agent/daemonset.yaml b/charts/kubescape-cloud-operator/templates/node-agent/daemonset.yaml
@@ -57,6 +57,18 @@ spec:
  kubernetes.io/os: linux
  kubernetes.io/arch: amd64
  volumes:
+ - name: {{ .Values.global.cloudConfig }}
+ configMap:
+ name: {{ .Values.global.cloudConfig }}
+ items:
+ - key: "clusterData"
+ path: "clusterData.json"
+ - name: config
+ configMap:
+ name: {{ .Values.nodeAgent.name }}
+ items:
+ - key: "config.json"
+ path: "config.json"
  {{- range .Values.nodeAgent.volumes }}
  - name: {{ .name }}
  {{- if .configMap }}
@@ -121,6 +133,14 @@ spec:
  add:
  - SYS_ADMIN
  volumeMounts:
+ - name: {{ .Values.global.cloudConfig }}
+ mountPath: /etc/config/clusterData.json
+ readOnly: true
+ subPath: "clusterData.json"
+ - name: config
+ mountPath: /etc/config/config.json
+ readOnly: true
+ subPath: "config.json"
  {{- range .Values.nodeAgent.containers.nodeAgent.volumeMounts }}
  - mountPath: {{ .mountPath }}
  name: {{ .name }}

diff --git a/charts/kubescape-cloud-operator/values.yaml b/charts/kubescape-cloud-operator/values.yaml
@@ -567,9 +567,8 @@ nodeAgent:
  name: "node-agent"
 
  config: 
- name: node-agent-config-map
- maxLearningPeriod: 180 # minutes
- learningPeriod: 2 # minutes
+ maxLearningPeriod: 3h
+ learningPeriod: 2m
 
  resources:
  requests:
@@ -607,20 +606,16 @@ nodeAgent:
  containers: 
  nodeAgent:
  name: node-agent
- image: 
+ image:
  repository: quay.io/matthiasb_1/node-agent
- tag: inspektor
+ tag: rewrite
  pullPolicy: Always
- env: 
- - name: CONFIG_ENV_VAR
- value: "/etc/node-agent/configuration/ConfigurationFile.json"
+ env:
  - name: NodeName
  valueFrom:
  fieldRef:
  fieldPath: spec.nodeName
  volumeMounts:
- - mountPath: /etc/node-agent/configuration
- name: configmap-volume
  - mountPath: /host
  name: host
  - mountPath: /run