Skip to content

Commit 567ac37

Browse files
committed
Merge branch 'dev' into 'master'
Fix opening /dev/<files> to see if it is a directory (dangerous and it can take too long) See merge request arm-research/smarter/smarter-device-manager!17
2 parents 1d718e5 + a6c2189 commit 567ac37

10 files changed

+18
-9
lines changed

main.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ func init() {
5858
func readDevDirectory(dirToList string) (files []string, err error) {
5959
var foundFiles []string
6060

61+
fType, err := os.Stat(dirToList)
62+
if err != nil {
63+
return nil, err
64+
}
65+
66+
if !fType.IsDir() {
67+
return nil, nil
68+
}
69+
6170
f, err := os.Open(dirToList)
6271
if err != nil {
6372
return nil, err

smarter-device-management-pod-k3s-test-xavier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
nodeName: smarter-jetson-xavier-4bcc2584
1616
containers:
1717
- name: smarter-device-manager
18-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
18+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
1919
imagePullPolicy: IfNotPresent
2020
securityContext:
2121
allowPrivilegeEscalation: false

smarter-device-management-pod-k3s.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
nodeName: <replace with node to run>
1616
containers:
1717
- name: smarter-device-manager
18-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
18+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
1919
imagePullPolicy: IfNotPresent
2020
securityContext:
2121
allowPrivilegeEscalation: false

smarter-device-management-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
nodeName: <replace with node to run>
1616
containers:
1717
- name: smarter-device-manager
18-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
18+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
1919
imagePullPolicy: IfNotPresent
2020
securityContext:
2121
allowPrivilegeEscalation: false

smarter-device-manager-ds-k3s.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
dnsPolicy: ClusterFirstWithHostNet
3535
containers:
3636
- name: smarter-device-manager
37-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
37+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
3838
imagePullPolicy: IfNotPresent
3939
securityContext:
4040
allowPrivilegeEscalation: false

smarter-device-manager-ds-with-configmap-rpi-k3s.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
dnsPolicy: ClusterFirstWithHostNet
3535
containers:
3636
- name: smarter-device-manager
37-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
37+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
3838
imagePullPolicy: IfNotPresent
3939
securityContext:
4040
allowPrivilegeEscalation: false

smarter-device-manager-ds-with-configmap-rpi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
dnsPolicy: ClusterFirstWithHostNet
3535
containers:
3636
- name: smarter-device-manager
37-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
37+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
3838
imagePullPolicy: IfNotPresent
3939
securityContext:
4040
allowPrivilegeEscalation: false

smarter-device-manager-ds-with-configmap-xavier-k3s.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
dnsPolicy: ClusterFirstWithHostNet
3535
containers:
3636
- name: smarter-device-manager
37-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
37+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
3838
imagePullPolicy: IfNotPresent
3939
securityContext:
4040
allowPrivilegeEscalation: false

smarter-device-manager-ds-with-configmap-xavier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
dnsPolicy: ClusterFirstWithHostNet
3535
containers:
3636
- name: smarter-device-manager
37-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
37+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
3838
imagePullPolicy: IfNotPresent
3939
securityContext:
4040
allowPrivilegeEscalation: false

smarter-device-manager-ds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
dnsPolicy: ClusterFirstWithHostNet
3535
containers:
3636
- name: smarter-device-manager
37-
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.5
37+
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager:v1.20.6
3838
imagePullPolicy: IfNotPresent
3939
securityContext:
4040
allowPrivilegeEscalation: false

0 commit comments

Comments
 (0)