Add JOB_LOCAL_TIMEOUT environment variable

Add extra environment variables for agent in helm. Remove old nuvlaedge-db volume in helm.
nuvlaedge · Oct 12, 2024 · 1b6a0c3 · 1b6a0c3
1 parent 84a1769
commit 1b6a0c3
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 48 deletions.
diff --git a/docker-compose-legacy.yml b/docker-compose-legacy.yml
@@ -66,6 +66,7 @@ services:
       - NUVLAEDGE_IMMUTABLE_SSH_PUB_KEY=${NUVLAEDGE_SSH_PUB_KEY:-}
       - NUVLAEDGE_JOB_ENGINE_LITE_IMAGE
       - NUVLAEDGE_EXEC_JOBS_IN_AGENT
+      - JOB_LOCAL_TIMEOUT
       - JOB_PULL_TIMEOUT
       - JOB_DOCKER_TIMEOUT
       - JOB_LOG_LEVEL
@@ -190,4 +191,3 @@ services:
       - "nuvlaedge.component=True"
       - "nuvlaedge.data-gateway=True"
       - "nuvlaedge.deployment=production"
-
diff --git a/docker-compose-slim-docker.yml b/docker-compose-slim-docker.yml
@@ -53,6 +53,7 @@ services:
       - NUVLAEDGE_IMMUTABLE_SSH_PUB_KEY=${NUVLAEDGE_SSH_PUB_KEY:-}
       - NUVLAEDGE_JOB_ENGINE_LITE_IMAGE
       - NUVLAEDGE_EXEC_JOBS_IN_AGENT
+      - JOB_LOCAL_TIMEOUT
       - JOB_PULL_TIMEOUT
       - JOB_DOCKER_TIMEOUT
       - JOB_LOG_LEVEL

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,6 +53,7 @@ services:
       - NUVLAEDGE_IMMUTABLE_SSH_PUB_KEY=${NUVLAEDGE_SSH_PUB_KEY:-}
       - NUVLAEDGE_JOB_ENGINE_LITE_IMAGE
       - NUVLAEDGE_EXEC_JOBS_IN_AGENT
+      - JOB_LOCAL_TIMEOUT
       - JOB_PULL_TIMEOUT
       - JOB_DOCKER_TIMEOUT
       - JOB_LOG_LEVEL
@@ -107,4 +108,3 @@ services:
       - NUVLAEDGE_UUID=${NUVLAEDGE_UUID}
     volumes:
       - nuvlaedge-data:/var/lib/nuvlaedge
-
diff --git a/helm/templates/agent-deployment.yaml b/helm/templates/agent-deployment.yaml
@@ -28,18 +28,22 @@ spec:
           securityContext:
             privileged: true
           env:
-            - name: NUVLAEDGE_LOG_LEVEL
-              value: {{ .Values.agentConfig.log_level }}
             - name: NUVLAEDGE_UUID
               value: {{ .Values.NUVLAEDGE_UUID }}
             - name: NUVLAEDGE_IMAGE
               value: "{{ .Values.nuvlaedge.image.registry }}{{ .Values.nuvlaedge.image.organization }}/{{ .Values.nuvlaedge.image.repository }}:{{ .Values.nuvlaedge.image.tag | default .Chart.AppVersion }}"
             - name: NUVLAEDGE_EXCLUDED_MONITORS
-              value: {{ .Values.agentConfig.excluded_monitors }}
+              value: {{ .Values.NUVLAEDGE_EXCLUDED_MONITORS | .Values.agentConfig.excluded_monitors }}
             - name: NUVLAEDGE_THREAD_MONITORS
               value: {{ .Values.NUVLAEDGE_THREAD_MONITORS | default "False" | quote }}
             - name: NUVLAEDGE_IMMUTABLE_SSH_PUB_KEY
               value: {{ .Values.NUVLAEDGE_IMMUTABLE_SSH_PUB_KEY }}
+            - name: NUVLAEDGE_EXEC_JOBS_IN_AGENT
+              value: {{ .Values.NUVLAEDGE_EXEC_JOBS_IN_AGENT }}
+            - name: NUVLAEDGE_LOG_LEVEL
+              value: {{ .Values.NUVLAEDGE_LOG_LEVEL | .Values.agentConfig.log_level }}
+            - name: NUVLAEDGE_DEBUG
+              value: {{ .Values.NUVLAEDGE_DEBUG }}
             - name: NUVLAEDGE_API_KEY
               value: {{ .Values.NUVLAEDGE_API_KEY }}
             - name: NUVLAEDGE_API_SECRET
@@ -58,6 +62,12 @@ spec:
               value: {{ .Values.VPN_INTERFACE_NAME | default "vpn" | quote }}
             - name: VPN_CONFIG_EXTRA
               value: {{ .Values.VPN_CONFIG_EXTRA }}
+            - name: JOB_IMAGE_PULL_POLICY
+              value: {{ .Values.JOB_IMAGE_PULL_POLICY | default "Always" | quote }}
+            - name: JOB_LOCAL_TIMEOUT
+              value: {{ .Values.JOB_LOCAL_TIMEOUT }}
+            - name: JOB_LOG_LEVEL
+              value: {{ .Values.JOB_LOG_LEVEL }}
             - name: MY_HOST_NODE_IP
               valueFrom:
                 fieldRef:
@@ -68,14 +78,10 @@ spec:
                   fieldPath: spec.nodeName
             - name: MY_NAMESPACE
               value: {{ include "nuvlaedge.namespace" . }}
-            - name: JOB_IMAGE_PULL_POLICY
-              value: {{ .Values.JOB_IMAGE_PULL_POLICY | default "Always" | quote }}
           volumeMounts:
             - mountPath: /rootfs
               name: rootfs
               readOnly: true
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
             - mountPath: /var/log/nuvlaedge
@@ -90,9 +96,6 @@ spec:
         - name: nuvlaedge-logs
           hostPath:
             path: {{ .Values.nuvlaedgeLogsVolumePath }}/{{ include "nuvlaedge.namespace" . }}
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data
diff --git a/helm/templates/kubernetes-credentials-manager-job.yaml b/helm/templates/kubernetes-credentials-manager-job.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "nuvlaedge.labels" . | nindent 4 }}
 spec:
-  revisionHistoryLimit: {{ .Values.deploymentRevHistLimit }} 
+  revisionHistoryLimit: {{ .Values.deploymentRevHistLimit }}
   ttlSecondsAfterFinished: {{ .Values.credManager.ttlJobFinished }}
   template:
     spec:
@@ -21,8 +21,6 @@ spec:
           command: ["kubernetes-credential-manager"]
           imagePullPolicy: {{ .Values.nuvlaedge.pullPolicy }}
           volumeMounts:
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
           env:
@@ -40,7 +38,4 @@ spec:
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
 {{- end -}}
diff --git a/helm/templates/peripheral-manager-bluetooth-deployment.yaml b/helm/templates/peripheral-manager-bluetooth-deployment.yaml
@@ -31,16 +31,11 @@ spec:
             - name: MY_NAMESPACE
               value: {{ include "nuvlaedge.namespace" . }}
           volumeMounts:
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
             - mountPath: /run/dbus/system_bus_socket
               name: dbus-socket
       volumes:
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data

diff --git a/helm/templates/peripheral-manager-gpu-deployment.yaml b/helm/templates/peripheral-manager-gpu-deployment.yaml
@@ -26,8 +26,6 @@ spec:
           image: "{{ .Values.nuvlaedge.image.registry }}{{ .Values.nuvlaedge.image.organization }}/{{ .Values.nuvlaedge.image.repository }}:{{ .Values.nuvlaedge.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.nuvlaedge.pullPolicy }}
           volumeMounts:
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
             - mountPath: /host/dev
@@ -42,9 +40,6 @@ spec:
             - name: MY_NAMESPACE
               value: {{ include "nuvlaedge.namespace" . }}
       volumes:
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data

diff --git a/helm/templates/peripheral-manager-modbus-deployment.yaml b/helm/templates/peripheral-manager-modbus-deployment.yaml
@@ -33,14 +33,9 @@ spec:
                 fieldRef:
                   fieldPath: status.hostIP
           volumeMounts:
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
       volumes:
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data

diff --git a/helm/templates/peripheral-manager-network-deployment.yaml b/helm/templates/peripheral-manager-network-deployment.yaml
@@ -31,15 +31,10 @@ spec:
             - name: MY_NAMESPACE
               value: {{ include "nuvlaedge.namespace" . }}
           volumeMounts:
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
       volumes:
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
 {{- end }}
diff --git a/helm/templates/peripheral-manager-usb-deployment.yaml b/helm/templates/peripheral-manager-usb-deployment.yaml
@@ -42,8 +42,6 @@ spec:
           volumeMounts:
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /dev
               name: dev
             - mountPath: /run/udev/control
@@ -53,9 +51,6 @@ spec:
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
         - hostPath:
             path: /dev
           name: dev

diff --git a/helm/templates/security-deployment.yaml b/helm/templates/security-deployment.yaml
@@ -38,18 +38,13 @@ spec:
           volumeMounts:
             - mountPath: /var/lib/nuvlaedge
               name: nuvlaedge-data
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
             - mountPath: /rootfs/etc/machine-id
               name: machine-id
 
       volumes:
         - name: nuvlaedge-data
           hostPath:
             path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
         - name: machine-id
           hostPath:
             path: /etc/machine-id