fix

kubearmor · Oct 28, 2023 · 8f74534 · 8f74534
1 parent c77a0a3
commit 8f74534
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/deployments/helm/KubeArmor/templates/deployment.yaml b/deployments/helm/KubeArmor/templates/deployment.yaml
@@ -22,10 +22,13 @@ spec:
       - image: {{printf "%s:%s" .Values.kubearmorRelay.image.repository .Values.kubearmorRelay.image.tag}}
         imagePullPolicy: {{ .Values.kubearmorRelay.imagePullPolicy }}
         name: kubearmor-relay-server
-        env:          
-        {{- with .Values.kubearmorRelay.env }}
-        {{- toYaml . | trim | nindent 8 }}
-        {{- end }}
+        env:
+        - name: ENABLE_STDOUT_LOGS
+          value: {{ .Values.kubearmorRelay.enableStdoutLogs }}
+        - name: ENABLE_STDOUT_ALERTS
+          value: {{ .Values.kubearmorRelay.enableStdoutAlerts }}
+        - name: ENABLE_STDOUT_MSGS
+          value: {{ .Values.kubearmorRelay.enableStdoutMsg }} 
         ports:
         - containerPort: 32767
       nodeSelector:

diff --git a/deployments/helm/KubeArmor/values.yaml b/deployments/helm/KubeArmor/values.yaml
@@ -16,13 +16,9 @@ kubearmorRelay:
   # kubearmor-init imagePullPolicy
   imagePullPolicy: Always
   # Add environment variables for STDOUT logging
-  env:
-    - name: ENABLE_STDOUT_LOGS
-      value: "false"
-    - name: ENABLE_STDOUT_ALERTS
-      value: "false"
-    - name: ENABLE_STDOUT_MSGS
-      value: "false"
+  enableStdoutLogs: "false"
+  enableStdoutAlerts: "false"
+  enableStdoutMsg: "false"
 
 kubearmorInit:
   image:

diff --git a/deployments/helm/KubeArmorOperator/crds/operator.kubearmor.com_kubearmorconfigs.yaml b/deployments/helm/KubeArmorOperator/crds/operator.kubearmor.com_kubearmorconfigs.yaml
@@ -121,6 +121,15 @@ spec:
                     - IfNotPresent
                     - Never
                     type: string
+                  env:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+                        value:
+                          type: string
                 type: object
             type: object
           status:

diff --git a/pkg/KubeArmorOperator/config/samples/sample-config.yml b/pkg/KubeArmorOperator/config/samples/sample-config.yml
@@ -23,6 +23,13 @@ spec:
   kubearmorRelayImage:
     image: kubearmor/kubearmor-relay-server
     imagePullPolicy: Always
+    env:
+    - name: ENABLE_STDOUT_LOGS
+      value: "false"
+    - name: ENABLE_STDOUT_ALERTS
+      value: "false"
+    - name: ENABLE_STDOUT_MSGS
+      value: "false"
   kubearmorControllerImage:
     image: kubearmor/kubearmor-controller
     imagePullPolicy: Always