Merge pull request #38 from brennoo/add_dependencies_config

Add config for dependencies image, resources
JupiterOne · Oct 23, 2024 · 62c0638 · 62c0638
2 parents c47d8f2 + a9a77db
commit 62c0638
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/charts/graph-kubernetes/Chart.yaml b/charts/graph-kubernetes/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: graph-kubernetes
 description: Converts K8s resources into a graph model for ingestion into JupiterOne.
 type: application
-version: 2.4.4
+version: 2.4.5
 appVersion: "2.4.4"
diff --git a/charts/graph-kubernetes/templates/cronjob.yaml b/charts/graph-kubernetes/templates/cronjob.yaml
@@ -124,9 +124,11 @@ spec:
           {{ end }}
           initContainers:
             - name: kubexit
-              image: cortexlabs/kubexit:0.40.0
+              image: "{{ .Values.kubexit.repository }}:{{ .Values.kubexit.tag }}"
               command: ['cp']
               args: ['/bin/kubexit', '/kubexit/kubexit']
+              resources:
+                 {{- toYaml .Values.kubexit.resources | nindent 16 }}
               volumeMounts:
                 - mountPath: /kubexit
                   name: kubexit
@@ -181,7 +183,7 @@ spec:
                 - mountPath: /kubexit
                   name: kubexit
             - name: otel-collector
-              image: otel/opentelemetry-collector-contrib:0.58.0
+              image: "{{ .Values.otelCollector.repository }}:{{ .Values.otelCollector.tag }}"
               imagePullPolicy: IfNotPresent
               command: ['/kubexit/kubexit', '/otelcol-contrib']
               args: ['--config=/conf/otel-agent-config.yaml']
@@ -202,6 +204,8 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
+              resources:
+                {{- toYaml .Values.otelCollector.resources | nindent 16 }}
               volumeMounts:
                 - name: otel-agent-config-vol
                   mountPath: /conf
@@ -210,7 +214,7 @@ spec:
                 - mountPath: /kubexit
                   name: kubexit
             - name: fluent-bit
-              image: fluent/fluent-bit:1.8
+              image: "{{ .Values.fluentBit.repository }}:{{ .Values.fluentBit.tag }}"
               imagePullPolicy: IfNotPresent
               command: ['/kubexit/kubexit', '/fluent-bit/bin/fluent-bit']
               args: ['--config=/fluent-bit/etc/fluent-bit.conf']
@@ -233,6 +237,8 @@ spec:
                   value: otel-collector       
                 - name: KUBEXIT_DEATH_DEPS
                   value: graph-kubernetes
+              resources:
+                {{- toYaml .Values.fluentBit.resources | nindent 16 }}
               volumeMounts:
                 - name: log-storage
                   mountPath: /mnt/log/

diff --git a/charts/graph-kubernetes/values.yaml b/charts/graph-kubernetes/values.yaml
@@ -119,3 +119,21 @@ securityContext:
 
 # Force namespace of namespaced resources
 forceNamespace: null
+
+####################
+### Dependencies ###
+####################
+kubexit:
+  repository: cortexlabs/kubexit
+  tag: 0.40.0
+  resources: {}
+
+otelCollector:
+  repository: otel/opentelemetry-collector-contrib
+  tag: 0.58.0
+  resources: {}
+
+fluentBit:
+  repository: fluent/fluent-bit
+  tag: 1.8
+  resources: {}