Skip to content

Commit 7a33532

Browse files
committed
Merge branch 'k3s-1.18' into 'master'
Add tty to the configmaps and rename yaml files to correspond to uses and README See merge request arm-research/smarter/smarter-device-manager!11
2 parents c7605e8 + 0eab2f3 commit 7a33532

11 files changed

+19
-56
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,6 @@ The following command should show the node resources in a similar form as shown
147147
kubectl describe node pike5
148148
```
149149

150+
## k3s
151+
152+
K3s < 1.18 stores the plugin interface in a different directory than k8s and so it needs a different yaml file to enable smarter-device-manager to communicate correctly with k3s agent. So use the smart-device-manager-k3s yaml files on this reposistor for k3s < 1.18.
File renamed without changes.

smarter-device-manager-configmap-rpi.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,11 @@ data:
2222
nummaxdevices: 20
2323
- devicematch: ^vcsm.*$
2424
nummaxdevices: 20
25+
- devicematch: ^ttyUSB[0-9]*$
26+
nummaxdevices: 1
27+
- devicematch: ^ttyACM[0-9]*$
28+
nummaxdevices: 1
29+
- devicematch: ^ttyTHS[0-9]*$
30+
nummaxdevices: 1
31+
- devicematch: ^ttyS[0-9]*$
32+
nummaxdevices: 1

smarter-device-manager-configmap-xavier.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,13 @@ data:
2222
nummaxdevices: 20
2323
- devicematch: ^vcsm.*$
2424
nummaxdevices: 20
25+
- devicematch: ^ttyUSB[0-9]*$
26+
nummaxdevices: 1
27+
- devicematch: ^ttyACM[0-9]*$
28+
nummaxdevices: 1
29+
- devicematch: ^ttyTHS[0-9]*$
30+
nummaxdevices: 1
31+
- devicematch: ^ttyS[0-9]*$
32+
nummaxdevices: 1
2533
- devicematch: nvidia-gpu
2634
nummaxdevices: 20
File renamed without changes.

smarter-device-manager-k8s-with-configmap-rpi.yaml renamed to smarter-device-manager-ds-with-configmap-rpi.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ spec:
3232
hostname: smarter-device-management
3333
hostNetwork: true
3434
dnsPolicy: ClusterFirstWithHostNet
35-
imagePullSecrets:
36-
- name: k8sedgeregcred
3735
containers:
3836
- name: smarter-device-manager
3937
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager/smarter-device-manager:IMAGE_ID

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ spec:
3232
hostname: smarter-device-management
3333
hostNetwork: true
3434
dnsPolicy: ClusterFirstWithHostNet
35-
imagePullSecrets:
36-
- name: k8sedgeregcred
3735
containers:
3836
- name: smarter-device-manager
3937
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager/smarter-device-manager:IMAGE_ID

smarter-device-manager-k8s-with-configmap-xavier.yaml renamed to smarter-device-manager-ds-with-configmap-xavier.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ spec:
3232
hostname: smarter-device-management
3333
hostNetwork: true
3434
dnsPolicy: ClusterFirstWithHostNet
35-
imagePullSecrets:
36-
- name: k8sedgeregcred
3735
containers:
3836
- name: smarter-device-manager
3937
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager/smarter-device-manager:IMAGE_ID

smarter-device-manager-k8s.yaml renamed to smarter-device-manager-ds.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ spec:
3232
hostname: smarter-device-management
3333
hostNetwork: true
3434
dnsPolicy: ClusterFirstWithHostNet
35-
imagePullSecrets:
36-
- name: k8sedgeregcred
3735
containers:
3836
- name: smarter-device-manager
3937
image: registry.gitlab.com/arm-research/smarter/smarter-device-manager/smarter-device-manager:IMAGE_ID

0 commit comments

Comments
 (0)