From 3b2b8921188912bd4549c9f2aaa8f760abfd99b2 Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Tue, 13 Apr 2021 08:30:04 -0700 Subject: [PATCH 1/4] remove udev directory mount from Agent Pods --- deployment/helm/templates/agent.yaml | 5 ----- deployment/helm/values.yaml | 2 -- 2 files changed, 7 deletions(-) diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml index 43349c93c..926219cd0 100644 --- a/deployment/helm/templates/agent.yaml +++ b/deployment/helm/templates/agent.yaml @@ -76,8 +76,6 @@ spec: mountPath: /host/usr/bin/crictl - name: var-run-dockershim mountPath: /host/var/run/dockershim.sock - - name: devices - mountPath: /run/udev {{- if .Values.prometheus.enabled }} ports: - name: {{ .Values.prometheus.portName | quote }} @@ -100,7 +98,4 @@ spec: - name: var-run-dockershim hostPath: path: "{{ .Values.agent.host.dockerShimSock }}" - - name: devices - hostPath: - path: "{{ .Values.agent.host.udev }}" {{- end }} \ No newline at end of file diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml index c68daf2fb..6c585fb7b 100644 --- a/deployment/helm/values.yaml +++ b/deployment/helm/values.yaml @@ -87,8 +87,6 @@ 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 # 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 From 1fa8170c82664b6eebb6d4b85f772aa36e7c74f7 Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Tue, 13 Apr 2021 08:30:28 -0700 Subject: [PATCH 2/4] increase version --- Cargo.lock | 28 +++++++++---------- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- deployment/helm/Chart.yaml | 4 +-- .../debug-echo-discovery-handler/Cargo.toml | 2 +- .../onvif-discovery-handler/Cargo.toml | 2 +- .../opcua-discovery-handler/Cargo.toml | 2 +- .../udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- version.txt | 2 +- webhooks/validating/configuration/Cargo.toml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6439ae73..b43b253b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-shared", "anyhow", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "async-trait", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "anyhow", @@ -1036,7 +1036,7 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "controller" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-shared", "anyhow", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2382,7 +2382,7 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "onvif-discovery-handler" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2448,7 +2448,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4516,7 +4516,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4527,7 +4527,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.6.0" +version = "0.6.1" dependencies = [ "akri-shared", "env_logger", @@ -4821,7 +4821,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.6.0" +version = "0.6.1" dependencies = [ "actix", "actix-rt", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 7499f3795..14304a8b8 100644 --- 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 ", ""] edition = "2018" diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 32c7da90c..3183a117d 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.6.0" +version = "0.6.1" authors = [""] edition = "2018" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index cc75f02c7..e73170c8d 100644 --- 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/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 69163499f..321333574 100644 --- 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 "] edition = "2018" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 568ced5f1..759bcf80f 100644 --- 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 "] edition = "2018" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index 4de98d666..b7225b07e 100644 --- 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 "] edition = "2018" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 574dd51b0..8198c800f 100644 --- 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 "] edition = "2018" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 73bd00da1..8fc85cb0c 100644 --- 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 "] edition = "2018" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 23187d391..81faacb79 100644 --- 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 "] edition = "2018" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 8c593e4fb..bb09f4ee9 100644 --- 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 "] edition = "2018" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index ef7bdf617..07d64f421 100644 --- 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 "] edition = "2018" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index e9c1db32f..5451477af 100644 --- 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 "] edition = "2018" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 6a1f778e4..61b002a6e 100644 --- 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 ", ""] edition = "2018" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 0ae77e5d8..688ff60f9 100644 --- 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 = [""] edition = "2018" diff --git a/version.txt b/version.txt index a918a2aa1..ee6cdce3c 100644 --- 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 index a345f9970..27ea6fa30 100644 --- 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 "] edition = "2018" From ab2009abee92acedc5fe8670f67ab92a02ba06be Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Wed, 14 Apr 2021 11:40:23 -0700 Subject: [PATCH 3/4] Revert "remove udev directory mount from Agent Pods" This reverts commit 3b2b8921188912bd4549c9f2aaa8f760abfd99b2. --- deployment/helm/templates/agent.yaml | 5 +++++ deployment/helm/values.yaml | 2 ++ 2 files changed, 7 insertions(+) diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml index 926219cd0..43349c93c 100644 --- a/deployment/helm/templates/agent.yaml +++ b/deployment/helm/templates/agent.yaml @@ -76,6 +76,8 @@ spec: mountPath: /host/usr/bin/crictl - name: var-run-dockershim mountPath: /host/var/run/dockershim.sock + - name: devices + mountPath: /run/udev {{- if .Values.prometheus.enabled }} ports: - name: {{ .Values.prometheus.portName | quote }} @@ -98,4 +100,7 @@ spec: - name: var-run-dockershim hostPath: path: "{{ .Values.agent.host.dockerShimSock }}" + - name: devices + hostPath: + path: "{{ .Values.agent.host.udev }}" {{- end }} \ No newline at end of file diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml index 6c585fb7b..c68daf2fb 100644 --- a/deployment/helm/values.yaml +++ b/deployment/helm/values.yaml @@ -87,6 +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 # 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 From 6fae7f333d19d60e3b771de5882b980bd68786cb Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Wed, 14 Apr 2021 13:28:43 -0700 Subject: [PATCH 4/4] default to no udev directory mounted --- deployment/helm/templates/agent.yaml | 4 ++++ deployment/helm/templates/udev-discovery-handler.yaml | 9 +++++++++ deployment/helm/values.yaml | 7 +++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml index 43349c93c..bf501a410 100644 --- 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 }} \ No newline at end of file diff --git a/deployment/helm/templates/udev-discovery-handler.yaml b/deployment/helm/templates/udev-discovery-handler.yaml index 73063c3b5..a3e181c44 100644 --- 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 }} \ No newline at end of file diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml index c68daf2fb..7847114b8 100644 --- 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: