Remove udev directory mount from Agent (#304)

project-akri · Apr 15, 2021 · 65d6297 · 65d6297
1 parent 33f872d
commit 65d6297
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -15,9 +15,9 @@ 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: 0.6.0
+version: 0.6.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.6.0
+appVersion: 0.6.1
diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml
@@ -76,8 +76,10 @@ spec:
             mountPath: /host/usr/bin/crictl
           - name: var-run-dockershim
             mountPath: /host/var/run/dockershim.sock
+          {{- if .Values.agent.host.udev }}
           - name: devices
             mountPath: /run/udev
+          {{- end }}
         {{- if .Values.prometheus.enabled }}
         ports:
           - name: {{ .Values.prometheus.portName | quote }}
@@ -100,7 +102,9 @@ spec:
       - name: var-run-dockershim
         hostPath:
           path: "{{ .Values.agent.host.dockerShimSock }}"
+      {{- if .Values.agent.host.udev }}
       - name: devices
         hostPath:
           path: "{{ .Values.agent.host.udev }}"
+      {{- end }}
 {{- end }}
diff --git a/deployment/helm/templates/udev-discovery-handler.yaml b/deployment/helm/templates/udev-discovery-handler.yaml
@@ -49,6 +49,10 @@ spec:
         volumeMounts:
         - name: discovery-handlers
           mountPath: /var/lib/akri
+        {{- if .Values.udev.discovery.host.udev }}
+        - name: devices
+          mountPath: /run/udev
+        {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -61,4 +65,9 @@ spec:
       - name: discovery-handlers
         hostPath:
           path: {{ .Values.agent.host.discoveryHandlers }}
+      {{- if .Values.udev.discovery.host.udev }}
+      - name: devices
+        hostPath:
+          path: "{{ .Values.udev.discovery.host.udev }}"
+      {{- end }}
 {{- end }}
diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
@@ -87,8 +87,8 @@ agent:
     crictl: /usr/bin/crictl
     # dockerShimSock is the node path of the docker socket
     dockerShimSock: /var/run/dockershim.sock
-    # udev is the node path of udev
-    udev: /run/udev
+    # udev is the node path of udev, usually at `/run/udev`
+    udev:
   # allowDebugEcho dictates whether the Akri Agent will allow DebugEcho Configurations
   allowDebugEcho: false
   # linuxOnly dictates whether the Akri Agent will only run on a linux node
@@ -495,6 +495,9 @@ udev:
     # nodeSelectors is the array of nodeSelectors used to target nodes for the discovery handler to run on
     # This can be set from the helm command line using `--set udev.discovery.nodeSelectors.label="value"`
     nodeSelectors: {}
+    host: 
+      # udev is the node path of udev, usually at `/run/udev`
+      udev:
 
 # Admission Controllers (Webhooks)
 webhookConfiguration:

diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>"]
 edition = "2018"
 

diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Kate Goldenring <kate.goldenring@microsoft.com>", "<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["<bfjelds@microsoft.com>"]
 edition = "2018"
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.6.0
+0.6.1
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["DazWilkin <daz.wilkin@gmail.com>"]
 edition = "2018"